From: rnv Date: Thu, 10 Oct 2013 12:57:42 +0000 (+0000) Subject: Porting SALOME SMESH module to the CMake build system: initial version. X-Git-Tag: V7_3_0a1~129 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=1bd4ba8acdfe7ab1edc96a016836e174a393d445 Porting SALOME SMESH module to the CMake build system: initial version. --- diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100755 index 000000000..43a11d331 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,285 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) +PROJECT(SalomeSMESH C CXX Fortran) + +# Ensure a proper linker behavior: +CMAKE_POLICY(SET CMP0003 NEW) + +# Versioning +# =========== +# Project name, upper case +STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) + +SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) +SET(${PROJECT_NAME_UC}_VERSION + ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) +SET(${PROJECT_NAME_UC}_VERSION_DEV 1) + +# Find KERNEL +# =========== +SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR} CACHE PATH "Path to the Salome KERNEL") +IF(EXISTS ${KERNEL_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files") + INCLUDE(SalomeMacros) + FIND_PACKAGE(SalomeKERNEL REQUIRED) +ELSE(EXISTS ${KERNEL_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR") +ENDIF(EXISTS ${KERNEL_ROOT_DIR}) + +IF(SALOME_LIGHT_ONLY) + MESSAGE(FATAL_ERROR "SMESH module can't be built in Light mode (without CORBA)") +ENDIF() + +# Platform setup +# ============== +INCLUDE(SalomeSetupPlatform) # From KERNEL +# Always build libraries as shared objects: +SET(BUILD_SHARED_LIBS TRUE) +# Local macros: +LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local/cmake_files") + +# User options +# (some options have already been defined in KERNEL) +# ============ +#OPTION(SALOME_BUILD_TESTS "Build SALOME tests" ${SALOME_BUILD_TESTS}) For use in the future +OPTION(SALOME_BUILD_DOC "Generate SALOME SMESH documentation" ${SALOME_BUILD_DOC}) + +# Advanced options: +OPTION(SALOME_BUILD_GUI "Enable GUI" ON) +OPTION(SALOME_SMESH_USE_CGNS "Enable shape recognition from picture" OFF) +OPTION(SALOME_SMESH_USE_TBB "Enable shape recognition from picture" OFF) + +MARK_AS_ADVANCED(SALOME_BUILD_GUI SALOME_SMESH_USE_CGNS SALOME_SMESH_USE_TBB) + +# Prerequisites +# ============= +# Find "big" prerequisites first - they reference themselves many others +# -> this can help finding the smaller prerequisites and detect conficts. +# In our case KERNEL has already loaded many prereq: + +## +## From KERNEL: +## + +# Various +# Python +FIND_PACKAGE(SalomePython REQUIRED) +# PThread +FIND_PACKAGE(SalomePThread REQUIRED) +# SWIG +FIND_PACKAGE(SalomeSWIG REQUIRED) +# Boost +FIND_PACKAGE(SalomeBoost REQUIRED) +# CORBA +FIND_PACKAGE(SalomeOmniORB REQUIRED) +FIND_PACKAGE(SalomeOmniORBPy REQUIRED) +# LibXml2 +FIND_PACKAGE(SalomeLibXml2 REQUIRED) +# HDF5 +FIND_PACKAGE(SalomeHDF5 REQUIRED COMPONENTS C) + +# Other KERNEL optionals: +IF(SALOME_USE_MPI) + FIND_PACKAGE(SalomeMPI) # needed for doc generation by Sphinx +ENDIF() + +IF(SALOME_BUILD_DOC) + FIND_PACKAGE(SalomeDoxygen) + FIND_PACKAGE(SalomeSphinx) + SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) + SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) +ENDIF() + +# Find GUI +IF(SALOME_BUILD_GUI) + SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI") + IF(EXISTS ${GUI_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") + FIND_PACKAGE(SalomeGUI) + + ## + ## Prerequisites From GUI: + ## + # Qt4 + FIND_PACKAGE(SalomeQt4 REQUIRED COMPONENTS QtCore QtGui QtXml) + # SIP + FIND_PACKAGE(SalomeSIP REQUIRED) # should come after Python and before PyQt4 + # PyQt4 + FIND_PACKAGE(SalomePyQt4 REQUIRED) + # Qwt + FIND_PACKAGE(SalomeQwt) + ELSE(EXISTS ${GUI_ROOT_DIR}) + MESSAGE(FATAL_ERROR "GUI_ROOT_DIR is not well defined, SMESH will be built without GUI!!!") + ENDIF(EXISTS ${GUI_ROOT_DIR}) + SALOME_LOG_OPTIONAL_PACKAGE(SalomeGUI SALOME_BUILD_GUI) +ENDIF(SALOME_BUILD_GUI) + +# Find GEOM +# =========== +SET(GEOM_ROOT_DIR $ENV{GEOM_ROOT_DIR} CACHE PATH "Path to the Salome GEOM") +IF(EXISTS ${GEOM_ROOT_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${GEOM_ROOT_DIR}/adm_local/cmake_files") + FIND_PACKAGE(SalomeGEOM REQUIRED) +ELSE(EXISTS ${GEOM_ROOT_DIR}) + MESSAGE(FATAL_ERROR "We absolutely need a Salome GEOM, please define GEOM_ROOT_DIR") +ENDIF(EXISTS ${GEOM_ROOT_DIR}) + +## +## SMESH specifics +## + +# VTK is obligatiry for the SMESH +FIND_PACKAGE(SalomeVTK 6.0 REQUIRED) + +FIND_PACKAGE(SalomeCAS REQUIRED) + +IF(SALOME_SMESH_USE_CGNS) + FIND_PACKAGE(SalomeCGNS) + SALOME_LOG_OPTIONAL_PACKAGE(CGNS SALOME_SMESH_USE_CGNS) +ENDIF(SALOME_SMESH_USE_CGNS) + +IF(SALOME_SMESH_USE_TBB) + FIND_PACKAGE(SalomeTBB) + SALOME_LOG_OPTIONAL_PACKAGE(TBB SALOME_SMESH_USE_TBB) +ENDIF(SALOME_SMESH_USE_TBB) + +FIND_PACKAGE(SalomeMEDFile REQUIRED) + +# Detection summary: +SALOME_PACKAGE_REPORT_AND_CHECK() + +# Directories +# (default values taken from KERNEL) +# =========== +SET(SALOME_INSTALL_BINS "${SALOME_INSTALL_BINS}" CACHE PATH "Install path: SALOME binaries") +SET(SALOME_INSTALL_LIBS "${SALOME_INSTALL_LIBS}" CACHE PATH "Install path: SALOME libs") +SET(SALOME_INSTALL_IDLS "${SALOME_INSTALL_IDLS}" CACHE PATH "Install path: SALOME IDL files") +SET(SALOME_INSTALL_HEADERS "${SALOME_INSTALL_HEADERS}" CACHE PATH "Install path: SALOME headers") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "${SALOME_INSTALL_SCRIPT_SCRIPTS}" CACHE PATH + "Install path: SALOME scripts") +SET(SALOME_INSTALL_SCRIPT_DATA "${SALOME_INSTALL_SCRIPT_DATA}" CACHE PATH + "Install path: SALOME script data") +SET(SALOME_INSTALL_SCRIPT_PYTHON "${SALOME_INSTALL_SCRIPT_PYTHON}" CACHE PATH + "Install path: SALOME Python scripts") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "${SALOME_INSTALL_APPLISKEL_SCRIPTS}" CACHE PATH + "Install path: SALOME application skeleton - scripts") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "${SALOME_INSTALL_APPLISKEL_PYTHON}" CACHE PATH + "Install path: SALOME application skeleton - Python") +SET(SALOME_INSTALL_PYTHON "${SALOME_INSTALL_PYTHON}" CACHE PATH "Install path: SALOME Python stuff") +SET(SALOME_INSTALL_PYTHON_SHARED "${SALOME_INSTALL_PYTHON_SHARED}" CACHE PATH + "Install path: SALOME Python shared modules") +SET(SALOME_INSTALL_CMAKE_LOCAL "${SALOME_INSTALL_CMAKE_LOCAL}" CACHE PATH + "Install path: local SALOME CMake files") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "${SALOME_INSTALL_AMCONFIG_LOCAL}" CACHE PATH + "Install path: local SALOME config files (obsolete, to be removed)") +SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME resources") +SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation") + +# Specific to SMESH: +SET(SALOME_SMESH_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/smesh" CACHE PATH + "Install path: SALOME SMESH specific data") +SET(SALOME_SMESH_INSTALL_PLUGINS share/salome/plugins/smesh CACHE PATH + "Install path: SALOME SMESH plugins") + +MARK_AS_ADVANCED(SALOME_INSTALL_BINS SALOME_INSTALL_LIBS SALOME_INSTALL_IDLS SALOME_INSTALL_HEADERS) +MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON) +MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) +MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED) +MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC) +MARK_AS_ADVANCED(SALOME_SMESH_INSTALL_RES_DATA SALOME_SMESH_INSTALL_PLUGINS) + +# Sources +# ======== + +ADD_SUBDIRECTORY(idl) +ADD_SUBDIRECTORY(adm_local) +ADD_SUBDIRECTORY(resources) +ADD_SUBDIRECTORY(bin) +ADD_SUBDIRECTORY(src) +IF(SALOME_BUILD_DOC) + ADD_SUBDIRECTORY(doc) +ENDIF() + +# Header configuration +# ==================== +SALOME_XVERSION(${PROJECT_NAME}) +SALOME_CONFIGURE_FILE(SMESH_version.h.in SMESH_version.h INSTALL ${SALOME_INSTALL_HEADERS}) + +# Configuration export +# (here only the level 1 prerequisites are exposed) +# ==================== +INCLUDE(CMakePackageConfigHelpers) + +# List of targets in this project we want to make visible to the rest of the world. +# They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup" +SET(_${PROJECT_NAME}_exposed_targets + SMESHControls MeshDriver MeshDriverDAT MeshDriverGMF MeshDriverMED + MeshDriverSTL MeshDriverUNV MEDWrapperBase MEDWrapper MEDWrapper_V2_2 + MEFISTO2D SMDS SMESHimpl SMESHEngine SMESHClient SMESHDS + SMESHUtils StdMeshers StdMeshersEngine MeshJobManagerEngine + SPADDERPluginTesterEngine SalomeIDLSMESH SalomeIDLSPADDER +) + +IF(SALOME_BUILD_GUI) + LIST(APPEND _${PROJECT_NAME}_exposed_targets. + SMESHObject SMESHFiltersSelection SMESH GeomSelectionTools StdMeshersGUI + ) +ENDIF(SALOME_BUILD_GUI) + +IF(SALOME_SMESH_USE_CGNS) + LIST(APPEND _${PROJECT_NAME}_exposed_targets + MeshDriverCGNS + ) +ENDIF(SALOME_SMESH_USE_CGNS) + +# Add all targets to the build-tree export set +EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets} + FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake) + +# Create the configuration files: +# - in the build tree: + +# Ensure the variables are always defined for the configure: +SET(GEOM_ROOT_DIR "${GEOM_ROOT_DIR}") +SET(CGNS_ROOT_DIR "${CGNS_ROOT_DIR}") +SET(TBB_ROOT_DIR "${TBB_ROOT_DIR}") + +SET(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") +CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in + ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" + PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX + GEOM_ROOT_DIR CGNS_ROOT_DIR TBB_ROOT_DIR) + +WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake + VERSION ${${PROJECT_NAME_UC}_VERSION} + COMPATIBILITY AnyNewerVersion) + +# Install the CMake configuration files: +INSTALL(FILES + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" + DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}") + +# Install the export set for use with the install-tree +INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" + FILE ${PROJECT_NAME}Targets.cmake) diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 2244fdc0e..000000000 --- a/Makefile.am +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -if SMESH_ENABLE_GUI - ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files -else !SMESH_ENABLE_GUI - ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files -endif - -SUBDIRS = idl adm_local resources src bin doc - -DIST_SUBDIRS = idl adm_local resources src bin doc - -DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool - -salomeinclude_DATA = SMESH_version.h - -EXTRA_DIST += \ - build_configure \ - clean_configure \ - build_cmake \ - build_cmake.bat \ - LICENCE - -dist-hook: - rm -rf `find $(distdir) -name CVS` - -usr_docs: - (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) - -docs: usr_docs - -dev_docs: - (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/SMESH_version.h.in b/SMESH_version.h.in index fff237511..738d0841a 100644 --- a/SMESH_version.h.in +++ b/SMESH_version.h.in @@ -27,12 +27,22 @@ #if !defined(__SMESH_VERSION_H__) #define __SMESH_VERSION_H__ -/* - SMESH_VERSION is (major << 16) + (minor << 8) + patch. +/*! + Specify version of SALOME SMESH module, as follows + + SMESH_VERSION_MAJOR : (integer) number identifying major version + SMESH_VERSION_MINOR : (integer) number identifying minor version + SMESH_VERSION_MAINTENANCE : (integer) number identifying maintenance version + SMESH_VERSION_STR : (string) complete version number "major.minor.maintenance" + SMESH_VERSION : (hex) complete version number (major << 16) + (minor << 8) + maintenance + SMESH_DEVELOPMENT : (integer) indicates development version when set to 1 */ -#define SMESH_VERSION_STR "@VERSION@" -#define SMESH_VERSION @XVERSION@ -#define SMESH_DEVELOPMENT @VERSION_DEV@ +#define SMESH_VERSION_MAJOR @SALOMESMESH_MAJOR_VERSION@ +#define SMESH_VERSION_MINOR @SALOMESMESH_MINOR_VERSION@ +#define SMESH_VERSION_MAINTENANCE @SALOMESMESH_PATCH_VERSION@ +#define SMESH_VERSION_STR "@SALOMESMESH_VERSION@" +#define SMESH_VERSION @SALOMESMESH_XVERSION@ +#define SMESH_DEVELOPMENT @SALOMESMESH_VERSION_DEV@ #endif // __SMESH_VERSION_H__ diff --git a/SalomeSMESHConfig.cmake.in b/SalomeSMESHConfig.cmake.in new file mode 100644 index 000000000..d1f479dea --- /dev/null +++ b/SalomeSMESHConfig.cmake.in @@ -0,0 +1,138 @@ +# - Config file for the @PROJECT_NAME@ package +# It defines the following variables. +# Specific to the pacakge @PROJECT_NAME@ itself: +# @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file +# + +############################################################### +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or +# email : webmaster.salome@opencascade.com +############################################################### + +### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE: +@PACKAGE_INIT@ + +# Load the dependencies for the libraries of @PROJECT_NAME@ +# (contains definitions for IMPORTED targets). This is only +# imported if we are not built as a subproject (in this case targets are already there) +IF(NOT TARGET SMESHEngine AND NOT @PROJECT_NAME@_BINARY_DIR) + INCLUDE("@PACKAGE_SALOME_INSTALL_CMAKE_LOCAL@/@PROJECT_NAME@Targets.cmake") +ENDIF() + +# Package root dir: +SET_AND_CHECK(SMESH_ROOT_DIR_EXP "@PACKAGE_CMAKE_INSTALL_PREFIX@") + +# Include directories +SET_AND_CHECK(SMESH_INCLUDE_DIRS "${SMESH_ROOT_DIR_EXP}/@SALOME_INSTALL_HEADERS@") + +#### Now the specificities + +# Options exported by the package: +SET(SALOME_BUILD_DOC @SALOME_BUILD_DOC@) + +# Advanced options +SET(SALOME_BUILD_GUI @SALOME_BUILD_GUI@) +SET(SALOME_SMESH_USE_CGNS @SALOME_SMESH_USE_CGNS@) +SET(SALOME_SMESH_USE_TBB @SALOME_SMESH_USE_TBB@) + +# Level 1 prerequisites: +SET_AND_CHECK(GEOM_ROOT_DIR_EXP "@PACKAGE_GEOM_ROOT_DIR@") + +# Optional level 1 prerequisites: +IF(SALOME_SMESH_USE_CGNS) + SET_AND_CHECK(CGNS_ROOT_DIR_EXP "@PACKAGE_CGNS_ROOT_DIR@") +ENDIF() +IF(SALOME_SMESH_USE_TBB) + SET_AND_CHECK(TBB_ROOT_DIR_EXP "@PACKAGE_TBB_ROOT_DIR@") +ENDIF() + +# For all prerequisites, load the corresponding targets if the package was used +# in CONFIG mode. This ensures dependent projects link correctly +# without having to set LD_LIBRARY_PATH: +SET(_PREREQ CGNS TBB) +SET(_PREREQ_CONFIG_DIR "@CGNS_DIR@" "@TBB_DIR@" ) +LIST(LENGTH _PREREQ_CONFIG_DIR _list_len) +# Another CMake stupidity - FOREACH(... RANGE r) generates r+1 numbers ... +MATH(EXPR _range "${_list_len}-1") +FOREACH(_p RANGE ${_range}) + LIST(GET _PREREQ ${_p} _pkg ) + LIST(GET _PREREQ_CONFIG_DIR ${_p} _pkg_dir) + IF(_pkg_dir) + MESSAGE(STATUS "===> Reloading targets from ${_pkg} ...") + FIND_PACKAGE(${_pkg} REQUIRED NO_MODULE + PATHS "${_pkg_dir}" + NO_DEFAULT_PATH) + ENDIF() +ENDFOREACH() + +# Installation directories +SET(SALOME_INSTALL_BINS "@SALOME_INSTALL_BINS@") +SET(SALOME_INSTALL_LIBS "@SALOME_INSTALL_LIBS@") +SET(SALOME_INSTALL_IDLS "@SALOME_INSTALL_IDLS@") +SET(SALOME_INSTALL_HEADERS "@SALOME_INSTALL_HEADERS@") +SET(SALOME_INSTALL_SCRIPT_SCRIPTS "@SALOME_INSTALL_SCRIPT_SCRIPTS@") +SET(SALOME_INSTALL_SCRIPT_DATA "@SALOME_INSTALL_SCRIPT_DATA@") +SET(SALOME_INSTALL_SCRIPT_PYTHON "@SALOME_INSTALL_SCRIPT_PYTHON@") +SET(SALOME_INSTALL_APPLISKEL_SCRIPTS "@SALOME_INSTALL_APPLISKEL_SCRIPTS@") +SET(SALOME_INSTALL_APPLISKEL_PYTHON "@SALOME_INSTALL_APPLISKEL_PYTHON@") +SET(SALOME_INSTALL_CMAKE_LOCAL "@SALOME_INSTALL_CMAKE_LOCAL@") +SET(SALOME_INSTALL_PYTHON "@SALOME_INSTALL_PYTHON@") +SET(SALOME_INSTALL_PYTHON_SHARED "@SALOME_INSTALL_PYTHON_SHARED@") +SET(SALOME_INSTALL_RES "@SALOME_INSTALL_RES@") +SET(SALOME_INSTALL_DOC "@SALOME_INSTALL_DOC@") +SET(SALOME_INSTALL_AMCONFIG_LOCAL "@SALOME_INSTALL_AMCONFIG_LOCAL@") + +# Include GEOM targets if they were not already loaded: +IF(NOT (TARGET GEOMbasic)) + INCLUDE("${GEOM_ROOT_DIR_EXP}/${SALOME_INSTALL_CMAKE_LOCAL}/SalomeGEOMTargets.cmake") +ENDIF(NOT (TARGET GEOMbasic)) + +# Exposed SMESH targets: +SET(SMESH_SMESHControls SMESHControls) +SET(SMESH_MeshDriver MeshDriver) +SET(SMESH_MeshDriverCGNS MeshDriverCGNS) +SET(SMESH_MeshDriverDAT MeshDriverDAT) +SET(SMESH_MeshDriverGMF MeshDriverGMF) +SET(SMESH_MeshDriverMED MeshDriverMED) +SET(SMESH_MeshDriverSTL MeshDriverSTL) +SET(SMESH_MeshDriverUNV MeshDriverUNV) +SET(SMESH_MEDWrapperBase MEDWrapperBase) +SET(SMESH_MEDWrapper MEDWrapper) +SET(SMESH_MEDWrapper_V2_2 MEDWrapper_V2_2) +SET(SMESH_MEFISTO2D MEFISTO2D) +SET(SMESH_SMESHObject SMESHObject) +SET(SMESH_GeomSelectionTools GeomSelectionTools) +SET(SMESH_SMDS SMDS) +SET(SMESH_SMESHimpl SMESHimpl) +SET(SMESH_SMESHEngine SMESHEngine) +SET(SMESH_SMESHClient SMESHClient) +SET(SMESH_SMESHDS SMESHDS) +SET(SMESH_SMESHFiltersSelection SMESHFiltersSelection) +SET(SMESH_SMESH SMESH) +SET(SMESH_SMESHUtils SMESHUtils) +SET(SMESH_StdMeshers StdMeshers) +SET(SMESH_StdMeshersEngine StdMeshersEngine) +SET(SMESH_StdMeshersGUI StdMeshersGUI) +SET(SMESH_MeshJobManagerEngine MeshJobManagerEngine) +SET(SMESH_SPADDERPluginTesterEngine SPADDERPluginTesterEngine) +SET(SMESH_SalomeIDLSMESH SalomeIDLSMESH) +SET(SMESH_SalomeIDLSPADDER SalomeIDLSPADDER) \ No newline at end of file diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt new file mode 100755 index 000000000..84d97c22e --- /dev/null +++ b/adm_local/CMakeLists.txt @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(unix) +ADD_SUBDIRECTORY(cmake_files) diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am deleted file mode 100644 index e642b988c..000000000 --- a/adm_local/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = unix cmake_files diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt new file mode 100755 index 000000000..eff4cc428 --- /dev/null +++ b/adm_local/cmake_files/CMakeLists.txt @@ -0,0 +1,32 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# =============================================================== +# Files to be installed +# =============================================================== + +# These files are data, module or lib files +SET(_adm_data + FindCGNS.cmake + FindTBB.cmake + FindSalomeSMESH.cmake + FindSalomeCGNS.cmake + FindSalomeTBB.cmake +) +INSTALL(FILES ${_adm_data} DESTINATION ${SALOME_INSTALL_CMAKE_LOCAL}) diff --git a/adm_local/cmake_files/FindCGNS.cmake b/adm_local/cmake_files/FindCGNS.cmake new file mode 100644 index 000000000..34a0aa96c --- /dev/null +++ b/adm_local/cmake_files/FindCGNS.cmake @@ -0,0 +1,46 @@ +# - Find CGNS +# Sets the following variables: +# CGNS_INCLUDE_DIRS - path to the CGNS include directory +# CGNS_LIBRARIES - path to the CGNS libraries to be linked against +# + +######################################################################### +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# ------ + +MESSAGE(STATUS "Check for CGNS ...") + +# ------ + +SET(CGNS_ROOT_DIR $ENV{CGN_ROOT_DIR} CACHE PATH "Path to the CGNS.") + +IF(CGNS_ROOT_DIR) + LIST(APPEND CMAKE_PREFIX_PATH "${CGNS_ROOT_DIR}") +ENDIF(CGNS_ROOT_DIR) + +FIND_PATH(CGNS_INCLUDE_DIRS cgnslib.h) +FIND_LIBRARY(CGNS_LIBRARIES NAMES cgns) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(CGNS REQUIRED_VARS CGNS_INCLUDE_DIRS CGNS_LIBRARIES) diff --git a/adm_local/cmake_files/FindSalomeCGNS.cmake b/adm_local/cmake_files/FindSalomeCGNS.cmake new file mode 100644 index 000000000..76d5a677b --- /dev/null +++ b/adm_local/cmake_files/FindSalomeCGNS.cmake @@ -0,0 +1,21 @@ +# Copyright (C) 2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(CGNS CGNS_INCLUDE_DIRS 1) +MARK_AS_ADVANCED(CGNS_INCLUDE_DIRS CGNS_LIBRARIES) diff --git a/adm_local/cmake_files/FindSalomeSMESH.cmake b/adm_local/cmake_files/FindSalomeSMESH.cmake new file mode 100644 index 000000000..c316f9da8 --- /dev/null +++ b/adm_local/cmake_files/FindSalomeSMESH.cmake @@ -0,0 +1,31 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# + +IF(NOT SalomeSMESH_FIND_QUIETLY) + MESSAGE(STATUS "Looking for Salome SMESH ...") +ENDIF() + +SET(CMAKE_PREFIX_PATH "${SMESH_ROOT_DIR}") + +SALOME_FIND_PACKAGE(SalomeSMESH SalomeSMESH CONFIG) + +IF(NOT SalomeSMESH_FIND_QUIETLY) + MESSAGE(STATUS "Found Salome SMESH: ${SMESH_ROOT_DIR}") +ENDIF() diff --git a/adm_local/cmake_files/FindSalomeTBB.cmake b/adm_local/cmake_files/FindSalomeTBB.cmake new file mode 100644 index 000000000..ddc3ccea1 --- /dev/null +++ b/adm_local/cmake_files/FindSalomeTBB.cmake @@ -0,0 +1,21 @@ +# Copyright (C) 2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(TBB TBB_INCLUDE_DIRS 2) +MARK_AS_ADVANCED(TBB_INCLUDE_DIRS TBB_LIBRARIES) diff --git a/adm_local/cmake_files/FindTBB.cmake b/adm_local/cmake_files/FindTBB.cmake new file mode 100644 index 000000000..86251788b --- /dev/null +++ b/adm_local/cmake_files/FindTBB.cmake @@ -0,0 +1,61 @@ +# - Find TBB +# Sets the following variables: +# TBB_INCLUDE_DIRS - path to the TBB include directory +# TBB_LIBRARIES - path to the TBB libraries to be linked against +# + +######################################################################### +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# ------ + +MESSAGE(STATUS "Check for TBB ...") + +# ------ + +SET(TBB_ROOT_DIR $ENV{TBB_ROOT_DIR}) + +IF(TBB_ROOT_DIR) + LIST(APPEND CMAKE_PREFIX_PATH "${TBB_ROOT_DIR}") +ENDIF(TBB_ROOT_DIR) + +FIND_PATH(TBB_INCLUDE_DIRS tbb.h PATH_SUFFIXES "include/tbb") + +SET(TBBKERNEL cc4.1.0_libc2.4_kernel2.6.16.21) + +IF(MACHINE_IS_64) + SET(LIB_SUFFIX lib/intel64/${TBBKERNEL}) +ELSE(MACHINE_IS_64) + SET(LIB_SUFFIX lib/ia32/${TBBKERNEL}) +ENDIF(MACHINE_IS_64) + +FIND_LIBRARY(TBB_LIBRARY_tbb NAMES tbb PATH_SUFFIXES "${LIB_SUFFIX}") +FIND_LIBRARY(TBB_LIBRATY_tbbmalloc NAMES tbbmalloc PATH_SUFFIXES "${LIB_SUFFIX}") + +SET(TBB_LIBRARIES + ${TBB_LIBRARY_tbb} + ${TBB_LIBRATY_tbbmalloc} +) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(TBB REQUIRED_VARS TBB_INCLUDE_DIRS TBB_LIBRARY_tbb TBB_LIBRATY_tbbmalloc) \ No newline at end of file diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am deleted file mode 100644 index 7f0c58afe..000000000 --- a/adm_local/cmake_files/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -admlocal_cmakedir = $(admlocaldir)/cmake_files - -dist_admlocal_cmake_DATA = \ -FindSMESH.cmake diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt new file mode 100755 index 000000000..2f895ae4b --- /dev/null +++ b/adm_local/unix/CMakeLists.txt @@ -0,0 +1,20 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(config_files) diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am deleted file mode 100644 index c68bae141..000000000 --- a/adm_local/unix/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = config_files diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt new file mode 100755 index 000000000..811a3abb2 --- /dev/null +++ b/adm_local/unix/config_files/CMakeLists.txt @@ -0,0 +1,28 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(_m4_data + check_SMESH.m4 + check_Platform.m4 +) + +INSTALL(FILES ${_m4_data} DESTINATION ${SALOME_INSTALL_AMCONFIG_LOCAL}/config_files) diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am deleted file mode 100644 index b62b0cd53..000000000 --- a/adm_local/unix/config_files/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_admlocalm4_DATA = \ - check_SMESH.m4 \ - check_Platform.m4 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am deleted file mode 100644 index c5c0f0595..000000000 --- a/adm_local/unix/make_common_starter.am +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# ============================================================ -# The following is to avoid PACKAGE_... env variable -# redefinition compilation warnings -# ============================================================ -# -AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h -AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h - -# ============================================================ -# This file defines the common definitions used in several -# Makefile. This file must be included, if needed, by the file -# Makefile.am. -# ============================================================ -# Standard directory for installation -# -salomeincludedir = $(includedir)/salome -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome -bindir = $(prefix)/bin/salome -salomescriptdir = $(bindir) -salomepythondir = $(pythondir)/salome -salomepyexecdir = $(pyexecdir)/salome - -# Root directory of the python packages of SMESH -smeshpypkgdir = $(salomepythondir)/salome/smesh - -# Directory for installing SALOME plugins files -salomepluginsdir = $(prefix)/share/salome/plugins/@MODULE_NAME@ - -# Directory for installing idl files -salomeidldir = $(prefix)/idl/salome - -# Directory for installing resource files -salomeresdir = $(prefix)/share/salome/resources/@MODULE_NAME@ - -# Directories for installing admin files -admlocaldir = $(prefix)/adm_local -admlocalunixdir = $(admlocaldir)/unix -admlocalm4dir = $(admlocaldir)/unix/config_files - -# Shared modules installation directory -sharedpkgpythondir = $(salomepythondir)/shared_modules - -# Documentation directory -docdir = $(datadir)/doc/salome - -# common rules - -# ============================================================ -# Cmake files wildcard (to add then to the distribution) -# ============================================================ -CMAKEFILES = $(notdir $(wildcard $(srcdir)/CMakeLists.txt)) - -# meta object implementation files generation (moc) -%_moc.cxx: %.h - $(MOC) $< -o $@ - -# translation (*.qm) files generation (lrelease) -%.qm: %.ts - $(LRELEASE) $< -qm $@ - -# resource files generation (qrcc) -qrc_%.cxx: %.qrc - $(QRCC) $< -o $@ -name $(*F) - -# qt forms files generation (uic) -ui_%.h: %.ui - $(UIC) -o $@ $< - -# extra distributed files -EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \ - $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts) \ - $(CMAKEFILES) - -# customize clean operation -mostlyclean-local: - rm -f @builddir@/*_moc.cxx - rm -f @builddir@/*.qm - rm -f @builddir@/ui_*.h - rm -f @builddir@/qrc_*.cxx - -# tests -tests: unittest - -unittest: $(UNIT_TEST_PROG) - @if test "x$(UNIT_TEST_PROG)" != "x"; then \ - $(UNIT_TEST_PROG); \ - fi; diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt new file mode 100755 index 000000000..dc1914013 --- /dev/null +++ b/bin/CMakeLists.txt @@ -0,0 +1,30 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) + +# --- scripts --- + +# scripts / static +SET(_bin_SCRIPTS + smesh_setenv.py +) + +# --- rules --- +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_BINS}) \ No newline at end of file diff --git a/bin/Makefile.am b/bin/Makefile.am deleted file mode 100644 index 449725b4e..000000000 --- a/bin/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# -* Makefile *- -# Author : Guillaume Boulant (CSSI) -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# non-distributed files -nodist_salomescript_DATA = VERSION - -# python files -dist_salomescript_PYTHON = \ - smesh_setenv.py - -# distributed files -dist_salomescript_SCRIPTS = diff --git a/bin/VERSION.in b/bin/VERSION.in index de81461c8..587f19c1f 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,3 @@ -[SALOME SMESH] : @VERSION@ -[DEVELOPMENT] : @VERSION_DEV@ +[SALOME SMESH] : @SALOMESMESH_VERSION@ +[DEVELOPMENT] : @SALOMESMESH_VERSION_DEV@ [DESCRIPTION] : SALOME Mesh module diff --git a/build_cmake b/build_cmake deleted file mode 100755 index 04e35220f..000000000 --- a/build_cmake +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -CURRENT_DIR=`pwd` -CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` -cd ${CONF_DIR} -python $KERNEL_ROOT_DIR/salome_adm/cmake_files/deprecated/am2cmake.py --smesh -status=$? -cd ${CURRENT_DIR} -exit $status diff --git a/build_cmake.bat b/build_cmake.bat deleted file mode 100644 index 692a22690..000000000 --- a/build_cmake.bat +++ /dev/null @@ -1,20 +0,0 @@ -@REM Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -@REM -@REM This library is free software; you can redistribute it and/or -@REM modify it under the terms of the GNU Lesser General Public -@REM License as published by the Free Software Foundation; either -@REM version 2.1 of the License. -@REM -@REM This library is distributed in the hope that it will be useful, -@REM but WITHOUT ANY WARRANTY; without even the implied warranty of -@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -@REM Lesser General Public License for more details. -@REM -@REM You should have received a copy of the GNU Lesser General Public -@REM License along with this library; if not, write to the Free Software -@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -@REM -@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -@REM - -%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\deprecated\am2cmake.py --smesh diff --git a/build_configure b/build_configure deleted file mode 100755 index a8500b6e8..000000000 --- a/build_configure +++ /dev/null @@ -1,122 +0,0 @@ -#!/bin/bash -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# Tool for updating list of .in file for the SALOME project -# and regenerating configure script -# Author : Marc Tajchman - CEA -# Date : 10/10/2002 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# $Header$ -# -ORIG_DIR=`pwd` -CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` - -######################################################################## -# Test if the KERNEL_ROOT_DIR is set correctly - -if test ! -d "${KERNEL_ROOT_DIR}"; then - echo "failed : KERNEL_ROOT_DIR variable is not correct !" - exit -fi - -# Test if the KERNEL_SRC is set correctly - -#if test ! -d "${KERNEL_SRC}"; then -# echo "failed : KERNEL_SRC variable is not correct !" -# exit -#fi - -######################################################################## -# Test if the GEOM_ROOT_DIR is set correctly - -if test ! -d "${GEOM_ROOT_DIR}"; then - echo "failed : GEOM_ROOT_DIR variable is not correct !" - exit -fi - - -cd ${CONF_DIR} -ABS_CONF_DIR=`pwd` - -####################################################################### - -# ____________________________________________________________________ -# aclocal creates the aclocal.m4 file from the standard macro and the -# custom macro embedded in the directory adm_local/unix/config_files, -# KERNEL salome_adm/unix/config_files, GEOM and MED adm_local/unix/config_files -# directories. -# output: -# aclocal.m4 -# autom4te.cache (directory) -echo "====================================================== aclocal" - -if test -d "${GUI_ROOT_DIR}"; then - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files || exit 1 -else - aclocal -I adm_local/unix/config_files \ - -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files || exit 1 -fi - - -# ____________________________________________________________________ -# libtoolize creates some configuration files (ltmain.sh, -# config.guess and config.sub). It only depends on the libtool -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). -# output: -# adm_local/unix/config_files/config.guess -# adm_local/unix/config_files/config.sub -# adm_local/unix/config_files/ltmain.sh -echo "==================================================== libtoolize" - -libtoolize --force --copy --automake || exit 1 - -# ____________________________________________________________________ -# autoconf creates the configure script from the file configure.ac (or -# configure.in if configure.ac doesn't exist) -# output: -# configure -echo "====================================================== autoconf" - -autoconf - -# ____________________________________________________________________ -# automake creates some scripts used in building process -# (install-sh, missing, ...). It only depends on the automake -# version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also -# creates the Makefile.in files from the Makefile.am files. -# output: -# adm_local/unix/config_files/compile -# adm_local/unix/config_files/depcomp -# adm_local/unix/config_files/install-sh -# adm_local/unix/config_files/missing -# adm_local/unix/config_files/py-compile -# Makefile.in (from Makefile.am) -echo "====================================================== automake" - -automake --copy --gnu --add-missing diff --git a/clean_configure b/clean_configure deleted file mode 100755 index 8cc92efc0..000000000 --- a/clean_configure +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -rm -rf autom4te.cache aclocal.m4 configure make_config -find . -name "*~" -print -exec rm {} \; -find . -name "*.pyc" -print -exec rm {} \; -#exit -# ==================== ON SORT AVANT - -find bin -name Makefile.in | xargs rm -f -find doc -name Makefile.in | xargs rm -f -find idl -name Makefile.in | xargs rm -f -find resources -name Makefile.in | xargs rm -f -find adm_local -name Makefile.in | xargs rm -f -find src -name Makefile.in | xargs rm -f -rm -f Makefile.in -cd adm_local/unix/config_files -rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 07888a278..000000000 --- a/configure.ac +++ /dev/null @@ -1,600 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# Author : Marc Tajchman (CEA) -# Date : 28/06/2001 -# Modified by : Patrick GOLDBRONN (CEA) -# Modified by : Marc Tajchman (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Created from configure.in.base -# -AC_INIT([Salome2 Project SMESH module], [7.2.0], [webmaster.salome@opencascade.com], [SalomeSMESH]) -AC_CONFIG_AUX_DIR(adm_local/unix/config_files) -AC_CANONICAL_HOST -AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE([-Wno-portability]) - -XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` -AC_SUBST(XVERSION) -VERSION_DEV=0 -AC_SUBST(VERSION_DEV) - -# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) -MODULE_NAME=smesh -AC_SUBST(MODULE_NAME) - -echo -echo --------------------------------------------- -echo Initialize source and build root directories -echo --------------------------------------------- -echo - -dnl -dnl Initialize source and build root directories -dnl - -ROOT_BUILDDIR=`pwd` -ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -cd $ROOT_SRCDIR -ROOT_SRCDIR=`pwd` -cd $ROOT_BUILDDIR - -AC_SUBST(ROOT_SRCDIR) -AC_SUBST(ROOT_BUILDDIR) - -echo -echo Source root directory : $ROOT_SRCDIR -echo Build root directory : $ROOT_BUILDDIR -echo -echo - -if test -z "$AR"; then - AC_CHECK_PROGS(AR,ar xar,:,$PATH) -fi -AC_SUBST(AR) - -dnl Export the AR macro so that it will be placed in the libtool file -dnl correctly. -export AR - -echo -echo --------------------------------------------- -echo testing make -echo --------------------------------------------- -echo - -AC_PROG_MAKE_SET -AC_PROG_INSTALL -AC_LOCAL_INSTALL -dnl -dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! - -echo -echo --------------------------------------------- -echo Configuring production -echo --------------------------------------------- -echo -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - -echo --------------------------------------------- -echo testing libtool -echo --------------------------------------------- - -dnl first, we set static to no! -dnl if we want it, use --enable-static -AC_ENABLE_STATIC(no) - -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -case "$INSTALL" in - *install-sh*) - INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh - ;; -esac - -echo -echo --------------------------------------------- -echo testing C/C++ -echo --------------------------------------------- -echo - -cc_ok=no -dnl inutil car libtool -dnl AC_PROG_CC -AC_PROG_CXX -AC_CXX_WARNINGS -AC_CXX_TEMPLATE_OPTIONS -AC_DEPEND_FLAG -# AC_CC_WARNINGS([ansi]) -cc_ok=yes - -echo -echo --------------------------------------------- -echo testing Fortran -echo --------------------------------------------- -echo - -fortran_ok=no -AC_PROG_F77 -AC_F77_LIBRARY_LDFLAGS -AC_PROG_FC -AC_FC_LIBRARY_LDFLAGS -if test "X$FC" != "X" ; then - fortran_ok=yes - F77=$FC -fi - -dnl AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) - -echo - -dnl Library libdl : -AC_CHECK_LIB(dl,dlopen) - -dnl add library libm : -AC_CHECK_LIB(m,ceil) - -dnl -dnl Well we use sstream which is not in gcc pre-2.95.3 -dnl We must test if it exists. If not, add it in include ! -dnl - -AC_CXX_HAVE_SSTREAM - -dnl -dnl --------------------------------------------- -dnl testing MPICH -dnl --------------------------------------------- -dnl - -dnl CHECK_MPICH - -echo -echo --------------------------------------------- -echo testing MPI -echo --------------------------------------------- -echo - -CHECK_MPI - -echo -echo --------------------------------------------- -echo testing LEX \& YACC -echo --------------------------------------------- -echo - -lex_yacc_ok=no -AC_PROG_YACC -AC_PROG_LEX -lex_yacc_ok=yes - -echo -echo --------------------------------------------- -echo testing python -echo --------------------------------------------- -echo - -CHECK_PYTHON - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing java -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_JAVA - -echo -echo --------------------------------------------- -echo testing swig -echo --------------------------------------------- -echo - -AM_PATH_PYTHON(2.3) -CHECK_SWIG - -echo -echo --------------------------------------------- -echo testing threads -echo --------------------------------------------- -echo - -ENABLE_PTHREADS - -if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then - echo - echo --------------------------------------------- - echo testing omniORB - echo --------------------------------------------- - echo - - CHECK_OMNIORB - -dnl echo -dnl echo --------------------------------------------- -dnl echo testing mico -dnl echo --------------------------------------------- -dnl echo - -dnl CHECK_MICO - - echo - echo --------------------------------------------- - echo default ORB : omniORB - echo --------------------------------------------- - echo - - DEFAULT_ORB=omniORB - - echo - echo --------------------------------------------- - echo testing Corba - echo --------------------------------------------- - echo - - CHECK_CORBA - - AC_SUBST_FILE(CORBA) - corba=make_$ORB - CORBA=adm_local/unix/$corba - -fi - -echo -echo --------------------------------------------- -echo Testing GUI -echo --------------------------------------------- -echo - -CHECK_GUI_MODULE - -gui_ok=no -if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then - gui_ok=yes -fi - -AM_CONDITIONAL(SMESH_ENABLE_GUI, [test "${gui_ok}" = "yes"]) - -if test "${SalomeGUI_need}" == "yes"; then - if test "${FullGUI_ok}" != "yes"; then - AC_MSG_WARN(For configure SMESH module necessary full GUI!) - fi -elif test "${SalomeGUI_need}" == "auto"; then - if test "${FullGUI_ok}" != "yes"; then - AC_MSG_WARN(Full GUI not found. Build will be done without GUI!) - fi -elif test "${SalomeGUI_need}" == "no"; then - echo Build without GUI option has been chosen -fi - -if test "${gui_ok}" = "yes"; then - echo - echo --------------------------------------------- - echo testing openGL - echo --------------------------------------------- - echo - - CHECK_OPENGL - - echo - echo --------------------------------------------- - echo testing QT - echo --------------------------------------------- - echo - - CHECK_QT - - echo - echo --------------------------------------------- - echo testing sip - echo --------------------------------------------- - echo - - CHECK_SIP - - echo - echo --------------------------------------------- - echo testing pyqt - echo --------------------------------------------- - echo - - CHECK_PYQT - - echo - echo --------------------------------------------- - echo Testing qwt - echo --------------------------------------------- - echo - - CHECK_QWT -fi - -echo -echo --------------------------------------------- -echo testing VTK -echo --------------------------------------------- -echo - -CHECK_VTK - -echo -echo --------------------------------------------- -echo testing HDF5 -echo --------------------------------------------- -echo - -CHECK_HDF5 - -echo -echo --------------------------------------------- -echo testing MED3 -echo --------------------------------------------- -echo - -CHECK_MED3 - -echo -echo --------------------------------------------- -echo BOOST Library -echo --------------------------------------------- -echo - -CHECK_BOOST - -echo -echo --------------------------------------------- -echo Testing OpenCascade -echo --------------------------------------------- -echo - -CHECK_CAS - -echo -echo --------------------------------------------- -echo Testing html generators -echo --------------------------------------------- -echo - -CHECK_HTML_GENERATORS - -echo -echo --------------------------------------------- -echo testing sphinx -echo --------------------------------------------- -echo -CHECK_SPHINX - -echo -echo --------------------------------------------- -echo testing libxm -echo --------------------------------------------- -echo -dnl Check the libxml that will be required to use the SALOME launcher -CHECK_LIBXML - -echo -echo --------------------------------------------- -echo Testing Kernel -echo --------------------------------------------- -echo - -CHECK_KERNEL - -echo -echo --------------------------------------------- -echo Testing Geom -echo --------------------------------------------- -echo - -CHECK_GEOM - -CHECK_PLATFORM - -echo -echo --------------------------------------------- -echo Testing CGNS library -echo --------------------------------------------- -echo - -CHECK_CGNS - -echo -echo --------------------------------------------- -echo Testing PADDER library -echo --------------------------------------------- -echo - -CHECK_CGAL -CHECK_PADDER - -echo -echo --------------------------------------------- -echo Testing TBB library -echo --------------------------------------------- -echo - -CHECK_TBB - -echo -echo --------------------------------------------- -echo Summary -echo --------------------------------------------- -echo - -echo Configure - -if test "${gui_ok}" = "yes"; then - variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok cgns_ok tbb_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok qwt_ok Kernel_ok Geom_ok gui_ok" -elif test "${SalomeGUI_need}" != "no"; then - variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok tbb_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok gui_ok" -else - variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok cgns_ok tbb_ok med3_ok omniORB_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok Geom_ok" -fi - -for var in $variables -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - -echo -echo "Default ORB : $DEFAULT_ORB" -echo - -echo "Optionnal products (for plugins):" -optional_vars="cgal_ok padder_ok" -for var in $optional_vars -do - printf " %10s : " `echo \$var | sed -e "s,_ok,,"` - eval echo \$$var -done - - - -dnl We don t need to say when we re entering directories if we re using -dnl GNU make becuase make does it for us. -if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" -else - AC_SUBST(SETX) SETX="set -x" -fi - -dnl AM_CONDITIONAL(GUI_ENABLE_CORBA, [test "$GUI_DISABLE_CORBA" = no]) -dnl AM_CONDITIONAL(ENABLE_PYCONSOLE, [test "$DISABLE_PYCONSOLE" = no]) -dnl AM_CONDITIONAL(ENABLE_GLVIEWER, [test "$DISABLE_GLVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_PLOT2DVIEWER, [test "$DISABLE_PLOT2DVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_SUPERVGRAPHVIEWER, [test "$DISABLE_SUPERVGRAPHVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_OCCVIEWER, [test "$DISABLE_OCCVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no]) -dnl AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) - -dnl Build with SMESH cancel compute feature -AC_DEFINE(WITH_SMESH_CANCEL_COMPUTE) - -echo -echo --------------------------------------------- -echo generating Makefiles and configure files -echo --------------------------------------------- -echo - -#AC_OUTPUT_COMMANDS([ \ -# chmod +x ./bin/*; \ -# chmod +x ./bin/salome/*; \ -#]) - -AC_HACK_LIBTOOL -AC_CONFIG_COMMANDS([hack_libtool],[ -sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\ - $(pwd)/hack_libtool \1 \"\$[@]\" \n\ -}\n\ -CC=\"hack_libtool\"%g" libtool -sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool -sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool -sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1 if ! test -d \$sss; then continue; fi\n\1 ssss=\$(cd \$sss; pwd)\n\1 if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1 case \$ssss in\n\1 /usr/lib | /usr/lib64 ) ;;\n\1 * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1 esac\n\1 fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool -],[]) - -# This list is initiated using autoscan and must be updated manually -# when adding a new file .in to manage. When you execute -# autoscan, the Makefile list is generated in the output file configure.scan. -# This could be helpfull to update de configuration. -AC_OUTPUT([ \ - adm_local/Makefile \ - adm_local/cmake_files/Makefile \ - adm_local/unix/Makefile \ - adm_local/unix/config_files/Makefile \ - bin/VERSION \ - bin/Makefile \ - SMESH_version.h \ - doc/Makefile \ - doc/docutils/Makefile \ - doc/docutils/conf.py \ - doc/salome/Makefile \ - doc/salome/examples/Makefile \ - doc/salome/gui/Makefile \ - doc/salome/gui/SMESH/Makefile \ - doc/salome/gui/SMESH/doxyfile \ - doc/salome/gui/SMESH/doxyfile_py \ - doc/salome/gui/SMESH/static/header.html \ - doc/salome/gui/SMESH/static/header_py.html \ - doc/salome/tui/Makefile \ - doc/salome/tui/doxyfile \ - doc/salome/tui/static/header.html \ - src/Makefile \ - src/Controls/Makefile \ - src/MEDWrapper/Makefile \ - src/MEDWrapper/Base/Makefile \ - src/MEDWrapper/Factory/Makefile \ - src/MEDWrapper/V2_2/Makefile \ - src/Driver/Makefile \ - src/DriverDAT/Makefile \ - src/DriverMED/Makefile \ - src/DriverSTL/Makefile \ - src/DriverUNV/Makefile \ - src/DriverGMF/Makefile \ - src/DriverCGNS/Makefile \ - src/MEFISTO2/Makefile \ - src/OBJECT/Makefile \ - src/PluginUtils/Makefile \ - src/SMDS/Makefile \ - src/SMESH/Makefile \ - src/SMESHUtils/Makefile \ - src/SMESHClient/Makefile \ - src/SMESHDS/Makefile \ - src/SMESHFiltersSelection/Makefile \ - src/SMESHGUI/Makefile \ - src/SMESH_I/Makefile \ - src/SMESH_SWIG/Makefile \ - src/SMESH_SWIG_WITHIHM/Makefile \ - src/StdMeshers/Makefile \ - src/StdMeshersGUI/Makefile \ - src/StdMeshers_I/Makefile \ - src/SMESH_PY/Makefile \ - src/Tools/Makefile \ - src/Tools/MeshCut/Makefile \ - src/Tools/YamsPlug/Makefile \ - src/Tools/YamsPlug/doc/Makefile \ - src/Tools/YamsPlug/doc/conf.py \ - src/Tools/MGCleanerPlug/Makefile \ - src/Tools/MGCleanerPlug/doc/Makefile \ - src/Tools/MGCleanerPlug/doc/conf.py \ - src/Tools/padder/Makefile \ - src/Tools/padder/meshjob/Makefile \ - src/Tools/padder/meshjob/idl/Makefile \ - src/Tools/padder/meshjob/impl/Makefile \ - src/Tools/padder/spadderpy/Makefile \ - src/Tools/padder/spadderpy/padder.cfg \ - src/Tools/padder/spadderpy/gui/Makefile \ - src/Tools/padder/spadderpy/plugin/Makefile \ - src/Tools/padder/spadderpy/plugin/envPlugins.sh \ - src/Tools/padder/resources/Makefile \ - src/Tools/padder/resources/testdata/Makefile \ - src/Tools/padder/unittests/Makefile \ - src/Tools/padder/unittests/autotest.sh \ - src/Tools/padder/doc/Makefile \ - src/Tools/padder/doc/doxyfile \ - resources/Makefile \ - resources/SMESHCatalog.xml \ - resources/SalomeApp.xml \ - idl/Makefile \ - Makefile -]) diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100755 index 000000000..645a52301 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,24 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(salome) +ADD_SUBDIRECTORY(docutils) diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 1f5027b11..000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# $Header$ -# source path -# -SUBDIRS = salome docutils -#SUBDIRS = salome - -usr_docs: - (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs) - -docs: usr_docs - -dev_docs: - (cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/doc/docutils/CMakeLists.txt b/doc/docutils/CMakeLists.txt new file mode 100755 index 000000000..a2e96786c --- /dev/null +++ b/doc/docutils/CMakeLists.txt @@ -0,0 +1,109 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# This file mainly prepares the environment in which sphinx should run: +# this sets the PYTHONPATH and LD_LIBRARY_PATH to include OMNIORB, DOCUTILS, SETUPTOOLS, etc ... + +# Prepare Sphinx options +SET(SPHINXOPTS +) +SET(SOURCEDIR + ${CMAKE_CURRENT_SOURCE_DIR} +) +SET(SPHINXBUILD + sphinx-build +) +SET(PAPEROPT_a4 + -D + latex_paper_size=a4 +) +SET(ALLSPHINXOPTS + -d + doctrees + ${PAPEROPT_a4} + ${SPHINXOPTS} + ${SOURCEDIR} +) + +SALOME_CONFIGURE_FILE(conf.py.in conf.py) + +# Write the shell file preparing the env for the Sphinx run: +# This uses the paths to SPHINX, DOCUTILS and SETUPTOOLS: +# Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake): + +SET(_pydir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +IF(WINDOWS) + STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\lib\\${_pydir}\\site-packages\\salome\;%PYTHONPATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH% + @SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH% + @SET PYTHONPATH=${HDF5_ROOT_DIR}\\lib\;%PYTHONPATH% + @SET PYTHONPATH=${MPI_ROOT_DIR}\\lib\;%PYTHONPATH% + + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\bin\\salome\;%PYTHONPATH% + @SET PATH=${KERNEL_ROOT_DIR}\\lib\\salome\;%PATH% + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH% + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH% + + @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PYTHONPATH% + @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\python\;%PYTHONPATH% + @SET PATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PATH% + ") + SET(EXT "bat") + SET(CALL_STR "call") +ELSE(WINDOWS) + SET(SCR " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH} + export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH} + export PYTHONPATH=${HDF5_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${MPI_ROOT_DIR}/lib:\${PYTHONPATH} + + export PYTHONPATH=${KERNEL_ROOT_DIR}/bin/salome:\${PYTHONPATH} + export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH} + export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH} + export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH} + + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH} + export LD_LIBRARY_PATH=${OMNIORB_ROOT_DIR}/lib:\${LD_LIBRARY_PATH} + export PYTHONPATH=${SETUPTOOLS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${DOCUTILS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${SPHINX_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} +" + ) + SET(EXT "sh") + SET(CALL_STR ".") +ENDIF(WINDOWS) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") + +ADD_CUSTOM_TARGET(html_docs ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINX_EXECUTABLE} $(SPHINXBUILD) -c ${PROJECT_BINARY_DIR}/doc/docutils -b html ${ALLSPHINXOPTS} docutils +) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils DESTINATION ${SALOME_INSTALL_DOC}/tui/SMESH) +INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/salome/tui/images/head.png ${PROJECT_SOURCE_DIR}/doc/salome/tui/images/smeshscreen.png + DESTINATION ${SALOME_INSTALL_DOC}/tui/SMESH) diff --git a/doc/docutils/Makefile.am b/doc/docutils/Makefile.am deleted file mode 100644 index 0de1c9d7f..000000000 --- a/doc/docutils/Makefile.am +++ /dev/null @@ -1,97 +0,0 @@ -# -*- coding: iso-8859-1 -*- -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -pydocdir = $(docdir)/tui/SMESH/docutils - -RSTFILES = \ - index.rst \ - overview.rst \ - docapi.rst - -EXTRA_DIST += $(RSTFILES) - -SPHINXOPTS = -SOURCEDIR = $(srcdir) -SPHINXBUILD = sphinx-build -PAPEROPT_a4 = -D latex_paper_size=a4 -ALLSPHINXOPTS = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR) - -if SMESH_ENABLE_GUI -SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(GUI_ROOT_DIR)/lib/salome:$(GUI_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GUI_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages -else !SMESH_ENABLE_GUI -SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages -endif - -if SMESH_ENABLE_GUI -SPHINX_LD_LIBRARY_PATH = $(GUI_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib -else !SMESH_ENABLE_GUI -SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib -endif - - -.PHONY: latex - -if SPHINX_IS_OK - -html/index.html:$(RSTFILES) - mkdir -p html doctrees - PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \ - LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \ - $(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b html $(ALLSPHINXOPTS) html - @echo - @echo "Build finished. The HTML pages are in html." - -else - -html/index.html: - @echo "Documentation for Python package not built. Sphinx was not present at configure time." - -endif - -latex: - mkdir -p latex doctrees - PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \ - LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \ - $(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b latex $(ALLSPHINXOPTS) latex - @echo - @echo "Build finished; the LaTeX files are in latex." - @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ - "run these through (pdf)latex." - -install-data-local: html/index.html - test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir) - if test -d "html"; then b=; else b="$(srcdir)/"; fi; \ - cp -rf $$b"html"/* $(pydocdir) ; \ - if test -f $$b"latex"/smeshpy.pdf; then cp -f $$b"latex"/smeshpy.pdf $(pydocdir) ; fi; - -uninstall-local: - -test -d $(pydocdir) && chmod -R +w $(pydocdir) && rm -rf $(pydocdir)/* - -clean-local: - -rm -rf html latex doctrees - if test -d "html"; then rm -rf html ; fi - -dist-hook: - -test -d html && cp -Rp html $(distdir) diff --git a/doc/docutils/conf.py.in b/doc/docutils/conf.py.in index 1aea4dc54..de04a7833 100644 --- a/doc/docutils/conf.py.in +++ b/doc/docutils/conf.py.in @@ -54,9 +54,9 @@ copyright = '2010 EDF R&D' # built documents. # # The short X.Y version. -version = '@VERSION@' +version = '@SALOMESMESH_VERSION@' # The full version, including alpha/beta/rc tags. -release = '@VERSION@' +release = '@SALOMESMESH_VERSION@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/salome/CMakeLists.txt b/doc/salome/CMakeLists.txt new file mode 100755 index 000000000..ea8a2e204 --- /dev/null +++ b/doc/salome/CMakeLists.txt @@ -0,0 +1,25 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(tui) +ADD_SUBDIRECTORY(gui) +ADD_SUBDIRECTORY(examples) \ No newline at end of file diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am deleted file mode 100644 index ad542920b..000000000 --- a/doc/salome/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# $Header: -# -SUBDIRS = tui gui examples -SUBDIRSTUI = tui -SUBDIRSGUI = gui - -usr_docs: - @@SETX@; for d in $(SUBDIRSGUI); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; - -docs: usr_docs - -dev_docs: - @@SETX@; for d in $(SUBDIRSTUI); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; diff --git a/doc/salome/examples/CMakeLists.txt b/doc/salome/examples/CMakeLists.txt index 25a067cc4..706bfe41a 100644 --- a/doc/salome/examples/CMakeLists.txt +++ b/doc/salome/examples/CMakeLists.txt @@ -17,7 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(docdir ${CMAKE_INSTALL_PREFIX}/share/doc/salome) FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.py") -INSTALL(FILES ${files} DESTINATION ${docdir}/examples/SMESH) +INSTALL(FILES ${files} DESTINATION ${SALOME_INSTALL_DOC}/examples/SMESH) diff --git a/doc/salome/examples/Makefile.am b/doc/salome/examples/Makefile.am deleted file mode 100644 index 1846b16a2..000000000 --- a/doc/salome/examples/Makefile.am +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile -# Author : Alexander KOVALEV (Open Cascade NN) -# Modified by : -# Module : doc -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -pyexamplesdir = $(docdir)/examples/SMESH - -BAD_TESTS = \ - 3dmesh.py \ - creating_meshes_ex01.py \ - creating_meshes_ex03.py \ - creating_meshes_ex05.py \ - defining_hypotheses_ex06.py \ - defining_hypotheses_ex09.py \ - defining_hypotheses_ex17.py \ - filters_ex02.py \ - filters_ex08.py \ - filters_ex23.py \ - filters_ex24.py \ - filters_ex25.py \ - filters_ex32.py \ - filters_ex35.py \ - generate_flat_elements.py \ - modifying_meshes_ex26.py \ - notebook_smesh.py \ - quality_controls_ex06.py \ - quality_controls_ex20.py \ - quality_controls_ex21.py \ - quality_controls_ex22.py \ - viewing_meshes_ex01.py - -GOOD_TESTS = \ - cartesian_algo.py \ - creating_meshes_ex02.py \ - creating_meshes_ex04.py \ - creating_meshes_ex06.py \ - creating_meshes_ex07.py \ - creating_meshes_ex08.py \ - defining_hypotheses_ex01.py \ - defining_hypotheses_ex02.py \ - defining_hypotheses_ex03.py \ - defining_hypotheses_ex04.py \ - defining_hypotheses_ex05.py \ - defining_hypotheses_ex07.py \ - defining_hypotheses_ex08.py \ - defining_hypotheses_ex10.py \ - defining_hypotheses_ex11.py \ - defining_hypotheses_ex12.py \ - defining_hypotheses_ex13.py \ - defining_hypotheses_ex14.py \ - defining_hypotheses_ex15.py \ - defining_hypotheses_ex16.py \ - filters_ex01.py \ - filters_ex03.py \ - filters_ex04.py \ - filters_ex05.py \ - filters_ex06.py \ - filters_ex07.py \ - filters_ex09.py \ - filters_ex10.py \ - filters_ex11.py \ - filters_ex12.py \ - filters_ex13.py \ - filters_ex14.py \ - filters_ex15.py \ - filters_ex16.py \ - filters_ex17.py \ - filters_ex18.py \ - filters_ex19.py \ - filters_ex20.py \ - filters_ex21.py \ - filters_ex22.py \ - filters_ex26.py \ - filters_ex27.py \ - filters_ex28.py \ - filters_ex29.py \ - filters_ex30.py \ - filters_ex31.py \ - filters_ex33.py \ - filters_ex34.py \ - filters_ex36.py \ - grouping_elements_ex01.py \ - grouping_elements_ex02.py \ - grouping_elements_ex03.py \ - grouping_elements_ex04.py \ - grouping_elements_ex05.py \ - grouping_elements_ex06.py \ - grouping_elements_ex07.py \ - grouping_elements_ex08.py \ - measurements_ex01.py \ - measurements_ex02.py \ - measurements_ex03.py \ - modifying_meshes_ex01.py \ - modifying_meshes_ex02.py \ - modifying_meshes_ex03.py \ - modifying_meshes_ex04.py \ - modifying_meshes_ex05.py \ - modifying_meshes_ex06.py \ - modifying_meshes_ex07.py \ - modifying_meshes_ex08.py \ - modifying_meshes_ex09.py \ - modifying_meshes_ex10.py \ - modifying_meshes_ex11.py \ - modifying_meshes_ex12.py \ - modifying_meshes_ex13.py \ - modifying_meshes_ex14.py \ - modifying_meshes_ex15.py \ - modifying_meshes_ex16.py \ - modifying_meshes_ex17.py \ - modifying_meshes_ex18.py \ - modifying_meshes_ex19.py \ - modifying_meshes_ex20.py \ - modifying_meshes_ex21.py \ - modifying_meshes_ex22.py \ - modifying_meshes_ex23.py \ - modifying_meshes_ex24.py \ - modifying_meshes_ex25.py \ - prism_3d_algo.py \ - quality_controls_ex01.py \ - quality_controls_ex02.py \ - quality_controls_ex03.py \ - quality_controls_ex04.py \ - quality_controls_ex05.py \ - quality_controls_ex07.py \ - quality_controls_ex08.py \ - quality_controls_ex09.py \ - quality_controls_ex10.py \ - quality_controls_ex11.py \ - quality_controls_ex12.py \ - quality_controls_ex13.py \ - quality_controls_ex14.py \ - quality_controls_ex15.py \ - quality_controls_ex16.py \ - quality_controls_ex17.py \ - quality_controls_ex18.py \ - quality_controls_ex19.py \ - transforming_meshes_ex01.py \ - transforming_meshes_ex02.py \ - transforming_meshes_ex03.py \ - transforming_meshes_ex04.py \ - transforming_meshes_ex05.py \ - transforming_meshes_ex06.py \ - transforming_meshes_ex07.py \ - transforming_meshes_ex08.py \ - transforming_meshes_ex09.py \ - transforming_meshes_ex10.py \ - transforming_meshes_ex11.py \ - transforming_meshes_ex12.py \ - transforming_meshes_ex13.py \ - use_existing_faces.py \ - viewing_meshes_ex02.py - -pyexamples_SCRIPTS = $(BAD_TESTS) $(GOOD_TESTS) - -EXTRA_DIST += $(pyexamples_SCRIPTS) testme.py - -THIS_PYTHONPATH = $(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome -THIS_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome - -installcheck-local: - @for f in $(GOOD_TESTS) ; do \ - SMESH_ROOT_DIR=$(prefix) PYTHONPATH=$(THIS_PYTHONPATH):${PYTHONPATH} LD_LIBRARY_PATH=$(THIS_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} python -B $(top_srcdir)/doc/salome/examples/testme.py $(top_srcdir)/doc/salome/examples/$$f || exit 1; \ - done diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt new file mode 100755 index 000000000..ae150c8a0 --- /dev/null +++ b/doc/salome/gui/CMakeLists.txt @@ -0,0 +1,23 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(SMESH) diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am deleted file mode 100644 index 6d83072e2..000000000 --- a/doc/salome/gui/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : doc -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = SMESH - -usr_docs: - (cd SMESH && $(MAKE) $(AM_MAKEFLAGS) usr_docs) - -docs: usr_docs diff --git a/doc/salome/gui/SMESH/CMakeLists.txt b/doc/salome/gui/SMESH/CMakeLists.txt index a0c5fe79a..91130e103 100644 --- a/doc/salome/gui/SMESH/CMakeLists.txt +++ b/doc/salome/gui/SMESH/CMakeLists.txt @@ -19,23 +19,15 @@ INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) -SET(top_builddir ${CMAKE_BINARY_DIR}) -SET(top_srcdir ${CMAKE_SOURCE_DIR}) -SET(srcdir ${CMAKE_CURRENT_SOURCE_DIR}) -SET(builddir ${CMAKE_CURRENT_BINARY_DIR}) -SET(datadir ${CMAKE_INSTALL_PREFIX}/share) -SET(docdir ${datadir}/doc/salome) -SET(guidocdir ${docdir}/gui/SMESH) - SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) SALOME_CONFIGURE_FILE(doxyfile_py.in doxyfile_py) -SALOME_CONFIGURE_FILE(static/header.html.in ${builddir}/static/header.html) -SALOME_CONFIGURE_FILE(static/header_py.html.in ${builddir}/static/header_py.html) +SALOME_CONFIGURE_FILE(static/header.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header.html) +SALOME_CONFIGURE_FILE(static/header_py.html.in ${CMAKE_CURRENT_BINARY_DIR}/static/header_py.html) -SALOME_INSTALL_SCRIPTS(collect_mesh_methods.py bin/salome) +SALOME_INSTALL_SCRIPTS(collect_mesh_methods.py ${SALOME_INSTALL_BINS}) SET(DOC_SMESH_MeshersList StdMeshers) -SET(f1 "${srcdir}/collect_mesh_methods.py") +SET(f1 "${CMAKE_CURRENT_SOURCE_DIR}/collect_mesh_methods.py") SET(f "$ENV{KERNEL_ROOT_DIR}/bin/salome/prepare_generating_doc.py") IF(WINDOWS) STRING(REPLACE "/" "\\" f ${f}) @@ -67,7 +59,7 @@ ENDIF(WINDOWS) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tmp_env.${EXT} "${SCR}") -ADD_CUSTOM_TARGET(usr_docs mkdir -p tmp1 tmp2 +ADD_CUSTOM_TARGET(usr_docs mkdir -p tmp1 tmp2 COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp2/smeshBuilder.py ${CMAKE_SOURCE_DIR}/src/SMESH_SWIG/smeshBuilder.py COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp2/smesh_algorithm.py ${CMAKE_SOURCE_DIR}/src/SMESH_SWIG/smesh_algorithm.py COMMAND ${PYTHON_EXECUTABLE} ${f} -o tmp2/StdMeshersBuilder.py ${CMAKE_SOURCE_DIR}/src/SMESH_SWIG/StdMeshersBuilder.py @@ -76,8 +68,11 @@ ADD_CUSTOM_TARGET(usr_docs mkdir -p tmp1 tmp2 COMMAND ${DOXYGEN_EXECUTABLE} doxyfile COMMAND ${PYTHON_EXECUTABLE} -c "import os, shutil; shutil.rmtree(r'''tmp1'''); shutil.rmtree(r'''tmp2''')" COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/SMESH''', True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/SMESH''', ignore=shutil.ignore_patterns('tmp_env.*', '*usr_docs*', '*CMakeFiles*', '*.cmake', 'doxyfile*', '*.vcproj', 'static', 'Makefile*')); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/SMESH'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''', r'''${CMAKE_INSTALL_PREFIX}/share/doc/salome/gui/SMESH/smeshpy_doc''')" - VERBATIM - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +# VERBATIM +# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) ADD_DEPENDENCIES(usr_docs html_docs) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/SMESH DESTINATION ${SALOME_INSTALL_DOC}/gui) diff --git a/doc/salome/gui/SMESH/Makefile.am b/doc/salome/gui/SMESH/Makefile.am deleted file mode 100755 index aad285f22..000000000 --- a/doc/salome/gui/SMESH/Makefile.am +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : doc -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -EXTRA_DIST += images input static/footer.html static/salome_extra.css - -dist_salomescript_PYTHON = collect_mesh_methods.py - -guidocdir = $(docdir)/gui/SMESH -guidoc_DATA = images/head.png - -DOC_PYTHONPATH=$(prefix)/bin/salome:$(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GEOM_ROOT_DIR)/bin/salome:$(GEOM_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages -DOC_LD_LIBRARY_PATH=$(prefix)/lib/salome:$(GEOM_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome -DOC_SMESH_MeshersList=StdMeshers - -tmp1/smeshBuilder.py: $(top_srcdir)/src/SMESH_SWIG/StdMeshersBuilder.py $(srcdir)/collect_mesh_methods.py - @mkdir -p tmp1 && PYTHONPATH=$(DOC_PYTHONPATH):${PYTHONPATH} LD_LIBRARY_PATH=$(DOC_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} SMESH_MeshersList=$(DOC_SMESH_MeshersList) $(PYTHON) $(srcdir)/collect_mesh_methods.py -o $@ StdMeshers - -tmp2/smeshBuilder.py: $(top_srcdir)/src/SMESH_SWIG/smeshBuilder.py - @mkdir -p tmp2 && $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py -o $@ $< - -tmp2/smesh_algorithm.py: $(top_srcdir)/src/SMESH_SWIG/smesh_algorithm.py - @mkdir -p tmp2 && $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py -o $@ $< - -tmp2/StdMeshersBuilder.py: $(top_srcdir)/src/SMESH_SWIG/StdMeshersBuilder.py - @mkdir -p tmp2 && $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py -o $@ $< - -usr_docs: doxyfile_py doxyfile tmp1/smeshBuilder.py tmp2/smeshBuilder.py tmp2/smesh_algorithm.py tmp2/StdMeshersBuilder.py - @$(DOXYGEN) doxyfile_py ; \ - $(DOXYGEN) doxyfile - -docs: usr_docs - -clean-local: - @for filen in `find . -maxdepth 1` ; do \ - case $${filen} in \ - ./Makefile | ./doxyfile | ./doxyfile_py ) ;; \ - . | .. | ./static ) ;; \ - *) echo "Removing $${filen}" ; rm -rf $${filen} ;; \ - esac ; \ - done ; - -install-data-local: usr_docs - $(INSTALL) -d $(DESTDIR)$(docdir)/gui/SMESH - @for filen in `find . -maxdepth 1` ; do \ - case $${filen} in \ - ./Makefile | ./doxyfile | ./doxyfile_py ) ;; \ - ./doxyfile.bak | ./doxyfile_py.bak ) ;; \ - . | .. | ./static | ./tmp1 | ./tmp2 ) ;; \ - *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/SMESH ;; \ - esac ; \ - done ; \ - cp -rp $(srcdir)/images/head.png $(DESTDIR)$(docdir)/gui/SMESH/smeshpy_doc ; - -uninstall-local: - @test -d $(DESTDIR)$(guidocdir) && chmod -R +w $(DESTDIR)$(guidocdir) ; \ - for filen in `find $(DESTDIR)$(guidocdir) -mindepth 1 -maxdepth 1` dummy ; do \ - case $${filen} in \ - dummy ) ;; \ - $(DESTDIR)$(guidocdir)/yams ) ;; \ - $(DESTDIR)$(guidocdir)/MGCleaner ) ;; \ - $(DESTDIR)$(guidocdir)/head.png ) ;; \ - * ) echo "removing $${filen}" && rm -rf $${filen} ;; \ - esac ; \ - done diff --git a/doc/salome/gui/SMESH/doxyfile.in b/doc/salome/gui/SMESH/doxyfile.in index a05403362..5bbf12d85 100755 --- a/doc/salome/gui/SMESH/doxyfile.in +++ b/doc/salome/gui/SMESH/doxyfile.in @@ -24,7 +24,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "SALOME Mesh User's Guide" -OUTPUT_DIRECTORY = . +OUTPUT_DIRECTORY = SMESH CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English TAB_SIZE = 5 @@ -38,20 +38,20 @@ WARNINGS = YES #--------------------------------------------------------------------------- #Input related options #--------------------------------------------------------------------------- -INPUT = @srcdir@/input @top_srcdir@/src/Tools/padder/doc/input $(GEOM_ROOT_DIR)/share/doc/salome/gui/GEOM/input +INPUT = @CMAKE_CURRENT_SOURCE_DIR@/input @CMAKE_SOURCE_DIR@/src/Tools/padder/doc/input $(GEOM_ROOT_DIR)/share/doc/salome/gui/GEOM/input FILE_PATTERNS = *.doc EXCLUDE = -IMAGE_PATH = @srcdir@/images @top_srcdir@/src/Tools/padder/doc/images $(GEOM_ROOT_DIR)/share/doc/salome/gui/GEOM -EXAMPLE_PATH = @top_srcdir@/doc/salome/examples @top_srcdir@/src/SMESH_SWIG +IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images @CMAKE_SOURCE_DIR@/src/Tools/padder/doc/images $(GEOM_ROOT_DIR)/share/doc/salome/gui/GEOM +EXAMPLE_PATH = @CMAKE_SOURCE_DIR@/doc/salome/examples @CMAKE_SOURCE_DIR@/src/SMESH_SWIG #--------------------------------------------------------------------------- #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = . -HTML_HEADER = @builddir@/static/header.html -HTML_FOOTER = @srcdir@/static/footer.html -HTML_EXTRA_STYLESHEET = @srcdir@/static/salome_extra.css +HTML_HEADER = @CMAKE_CURRENT_BINARY_DIR@/static/header.html +HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html +HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/doc/salome/gui/SMESH/doxyfile_py.in b/doc/salome/gui/SMESH/doxyfile_py.in index 7c0b089f5..49a9c51fb 100755 --- a/doc/salome/gui/SMESH/doxyfile_py.in +++ b/doc/salome/gui/SMESH/doxyfile_py.in @@ -24,7 +24,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "SALOME Mesh User's Guide" -OUTPUT_DIRECTORY = . +OUTPUT_DIRECTORY = SMESH CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English USE_WINDOWS_ENCODING = NO @@ -104,18 +104,18 @@ INPUT = tmp2/smeshBuilder.py \ tmp2/StdMeshersBuilder.py \ tmp1/smeshBuilder.py FILE_PATTERNS = -IMAGE_PATH = @srcdir@/images +IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images RECURSIVE = NO -EXAMPLE_PATH = @top_srcdir@/src/SMESH_SWIG +EXAMPLE_PATH = @CMAKE_SOURCE_DIR@/src/SMESH_SWIG #--------------------------------------------------------------------------- #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = smeshpy_doc -HTML_HEADER = @builddir@/static/header_py.html -HTML_FOOTER = @srcdir@/static/footer.html -HTML_EXTRA_STYLESHEET = @srcdir@/static/salome_extra.css +HTML_HEADER = @CMAKE_CURRENT_BINARY_DIR@/static/header_py.html +HTML_FOOTER = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html +HTML_EXTRA_STYLESHEET = @CMAKE_CURRENT_SOURCE_DIR@/static/salome_extra.css TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/doc/salome/gui/SMESH/input/clipping.doc b/doc/salome/gui/SMESH/input/clipping.doc index 2bfa8292b..6be9878e9 100644 --- a/doc/salome/gui/SMESH/input/clipping.doc +++ b/doc/salome/gui/SMESH/input/clipping.doc @@ -7,29 +7,64 @@ of your mesh. To start, click on the \em New button. -\image html a-clipping2.png - -Now you can define the parameters of cross-section: -
    -
  • List of meshes, sub-meshes and groups to which the cross-section will be applied. -/n Select all button allows to select and deselect all available -objects at once).
    • -
  • \b Orientation (X-Y, X-Z or Y-Z).
    • -
  • \b Distance between the opposite extremities of the boundary box -of selected objects, if it is set -to 0.5 the boundary box is split in two halves.
    • -
  • \b Rotation (in angle -degrees) around X (Y to Z) and around Y (X to Z).
    • -
  • If the Show preview button is on, you can see the clipping plane -in the 3D Viewer.
    • -
- -\image html image79.jpg "The plane and the cut object" +Now you must specify what mode of creating plane you want to choose: +absolute or relative. + +Absolute mode + +\image html Clipping_Absolute.png + +- Base point - allows to define the coordinates of the base + point for the clipping plane. + + - Reset - returns the base point to coordinate origin. + +- Direction - allows to define the orientation of the + clipping plane. + + - Invert - allows to select which part of the object will be + removed and which will remain after clipping. + +Relative mode + +\image html Clipping_Relative.png + +- \b Orientation ( ||X-Y, ||X-Z or ||Y-Z). +- \b Distance between the opposite extremities of the boundary box of +selected objects, if it is set to 0.5 the boundary box is split in two halves. +- \b Rotation (in angle degrees) around X (Y to Z) and around +Y (X to Z) (depending on the chosen Orientation) + +The parameters of cross-section: + +List of meshes, sub-meshes and groups to which the cross-section will be applied. + +Select all button allows to select and deselect all available +objects at once. + +If the Show preview button is on, you can see the clipping plane +in the 3D Viewer. + +\image html before_clipping.png "The plane and the cut object" + +Also there the possibility to interact directly with the clipping plane in 3D +view with mouse. User can change the parameters of clipping plane by dialog data +or by hand. + +\image html before_clipping_preview.png "The preview plane and the cut object" If the Auto Apply button is on, you can preview the cross-section in the 3D Viewer. -\image html image99.gif "The cross-section" +Also, it is possible to specify the type of clipping: using dataset, +i.e. it only changes the visibility of separate mesh cells or alternative +clipping - an OpenGL native one, which clips overall presentation. +For choosing use OpenGL clipping checkbox. + +\image html dataset_clipping.png "The cross-section using dataset" + + +\image html opengl_clipping.png "The OpenGL cross-section" To get a new object from \b Clipping, click \b Apply. diff --git a/doc/salome/gui/SMESH/static/header.html.in b/doc/salome/gui/SMESH/static/header.html.in index cd9329091..45674df6f 100755 --- a/doc/salome/gui/SMESH/static/header.html.in +++ b/doc/salome/gui/SMESH/static/header.html.in @@ -19,5 +19,5 @@ $extrastylesheet
-
Version: @VERSION@
+
Version: @SALOMESMESH_VERSION@
diff --git a/doc/salome/gui/SMESH/static/header_py.html.in b/doc/salome/gui/SMESH/static/header_py.html.in index 7b68cef81..e937979f6 100644 --- a/doc/salome/gui/SMESH/static/header_py.html.in +++ b/doc/salome/gui/SMESH/static/header_py.html.in @@ -19,6 +19,6 @@ $extrastylesheet
-
Version: @VERSION@
+
Version: @SALOMESMESH_VERSION@
diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt new file mode 100755 index 000000000..fa59289de --- /dev/null +++ b/doc/salome/tui/CMakeLists.txt @@ -0,0 +1,31 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) +SALOME_CONFIGURE_FILE(static/header.html.in static/header.html) + +ADD_CUSTOM_TARGET(dev_docs ${DOXYGEN_EXECUTABLE} + COMMAND ${PYTHON_EXECUTABLE} -c "import shutil, sys; shutil.rmtree(r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/GUI''', True); shutil.copytree(r'''${CMAKE_CURRENT_BINARY_DIR}/GUI''', r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/GUI'''); shutil.copy(r'''${CMAKE_CURRENT_SOURCE_DIR}/images/head.png''', r'''${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_DOC}/tui/GUI''')" + VERBATIM + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +) + diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am deleted file mode 100644 index bad8e29f5..000000000 --- a/doc/salome/tui/Makefile.am +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Module : doc -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -EXTRA_DIST += input images static/salome_extra.css static/footer.html - -tuidocdir = $(docdir)/tui/SMESH -tuidoc_DATA = images/head.png images/smeshscreen.png - -dev_docs: doxyfile - echo "Running doxygen in directory: "`pwd`; \ - $(DOXYGEN) $<; - -clean-local: - -rm -fr SMESH doxygen.bak - -install-data-local: - if test -d SMESH; then \ - $(INSTALL) -d $(DESTDIR)$(docdir)/tui ; \ - cp -rp SMESH $(DESTDIR)$(docdir)/tui ; \ - fi; - -uninstall-local: - @test -d $(DESTDIR)$(tuidocdir) && chmod -R +w $(DESTDIR)$(tuidocdir) ; \ - for filen in `find $(DESTDIR)$(tuidocdir) -mindepth 1 -maxdepth 1` dummy ; do \ - case $${filen} in \ - dummy ) ;; \ - $(DESTDIR)$(tuidocdir)/docutils ) ;; \ - $(DESTDIR)$(tuidocdir)/head.png ) ;; \ - $(DESTDIR)$(tuidocdir)/smeshscreen.png ) ;; \ - * ) echo "removing $${filen}" && rm -rf $${filen} ;; \ - esac ; \ - done diff --git a/doc/salome/tui/static/header.html.in b/doc/salome/tui/static/header.html.in index cd9329091..45674df6f 100755 --- a/doc/salome/tui/static/header.html.in +++ b/doc/salome/tui/static/header.html.in @@ -19,5 +19,5 @@ $extrastylesheet
-
Version: @VERSION@
+
Version: @SALOMESMESH_VERSION@
diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt new file mode 100755 index 000000000..8d2cdac64 --- /dev/null +++ b/idl/CMakeLists.txt @@ -0,0 +1,52 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseOmniORB) # Provided by KERNEL + +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${PROJECT_BINARY_DIR}/idl +) + +SET(SalomeIDLSMESH_IDLSOURCES + SMESH_Gen.idl + SMESH_Mesh.idl + SMESH_Hypothesis.idl + SMESH_BasicHypothesis.idl + SMESH_Filter.idl + SMESH_Group.idl + SMESH_Pattern.idl + SMESH_MeshEditor.idl + SMESH_Measurements.idl +) + +SET(_idl_include_dirs + ${KERNEL_ROOT_DIR}/idl/salome + ${GEOM_ROOT_DIR}/idl/salome +) + +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} + ${GEOM_SalomeIDLGEOM} +) + +OMNIORB_ADD_MODULE(SalomeIDLSMESH "${SalomeIDLSMESH_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLSMESH EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/idl/Makefile.am b/idl/Makefile.am deleted file mode 100644 index 887895f9a..000000000 --- a/idl/Makefile.am +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# This Makefile is responsible of generating the client and server -# implementation of IDL interfaces for both C++ and python usage. -# The building process of the C++ files is in charge of each source -# package and then is not manage here. -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -BASEIDL_FILES = \ - SMESH_Gen.idl \ - SMESH_Mesh.idl \ - SMESH_Hypothesis.idl \ - SMESH_BasicHypothesis.idl \ - SMESH_Filter.idl \ - SMESH_Group.idl \ - SMESH_Pattern.idl \ - SMESH_MeshEditor.idl \ - SMESH_Measurements.idl - -BASEIDL_FILES_PY=$(BASEIDL_FILES:%.idl=%_idl.py) - -# This variable defines the files to be installed -dist_salomeidl_DATA = $(BASEIDL_FILES) - -# GUI idl common library -lib_LTLIBRARIES = libSalomeIDLSMESH.la - -# Sources built from idl files -nodist_libSalomeIDLSMESH_la_SOURCES = \ - SMESH_MeshSK.cc \ - SMESH_HypothesisSK.cc \ - SMESH_GenSK.cc \ - SMESH_BasicHypothesisSK.cc \ - SMESH_FilterSK.cc \ - SMESH_GroupSK.cc \ - SMESH_PatternSK.cc \ - SMESH_MeshEditorSK.cc \ - SMESH_MeasurementsSK.cc - -# to be done at first, to avoid parallel compilation problems -BUILT_SOURCES = $(nodist_libSalomeIDLSMESH_la_SOURCES) - -# header files must be exported: other modules have to use this library -nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh) - -libSalomeIDLSMESH_la_CPPFLAGS = \ - -I$(top_builddir)/idl \ - $(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \ - $(KERNEL_CXXFLAGS) $(GEOM_CXXFLAGS) -libSalomeIDLSMESH_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeIDLSMESH_la_LIBADD = \ - @CORBA_LIBS@ \ - $(GEOM_LDFLAGS) -lSalomeIDLGEOM \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel - -# These variables defines the building process of CORBA files -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = \ - @OMNIORB_IDLPYFLAGS@ \ - -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome - -IDLCXXFLAGS = \ - -bcxx \ - @IDLCXXFLAGS@ \ - -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome - -IDLPYFLAGS = \ - @IDLPYFLAGS@ \ - -I$(KERNEL_ROOT_DIR)/idl/salome \ - -I$(GEOM_ROOT_DIR)/idl/salome - -# potential problem on parallel make on the following - multiple outputs -SUFFIXES = .idl .hh SK.cc -.idlSK.cc: - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< -.idl.hh: - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) - $(INSTALL) -d $(DESTDIR)$(salomepythondir) - ls $^ | while read file; do \ - $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ - done - -# we want to remove only staff generated for IDL files and nothing more -uninstall-local: - @for modulen in SMESH StdMeshers ; do \ - test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ - test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ - done ; \ - for filen in $(BASEIDL_FILES_PY) ; do \ - echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ - done - -mostlyclean-local: - -rm -f *.hh *.cc .depidl - -# we use cpp to generate dependencies between idl files. -# option x c tells the preprocessor to consider idl as a c file. -# if an idl is modified, all idl dependencies are rebuilt - -.depidl: $(BASEIDL_FILES) - @echo "" > $@ - @for dep in $^ dummy; do \ - if [ $$dep != "dummy" ]; then \ - echo Building dependencies for $$dep; \ - $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ - sed 's/\.o/\SK.cc/' >>$@; \ - fi; \ - done ; - --include .depidl diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt new file mode 100755 index 000000000..6b6cd1d3c --- /dev/null +++ b/resources/CMakeLists.txt @@ -0,0 +1,217 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(SMESH_RESOURCES_FILES + delete.png + mesh_add_sub.png + mesh_algo_hexa.png + mesh_algo_mefisto.png + mesh_algo_quad.png + mesh_algo_regular.png + mesh_algo_tetra.png + mesh_angle.png + mesh_area.png + mesh_aspect.png + mesh_aspect_3d.png + mesh_biquad_quadrangle.png + mesh_biquad_triangle.png + mesh_clear.png + mesh_compute.png + mesh_diagonal.png + mesh_edit.png + mesh_hexa.png + mesh_hypo_area.png + mesh_hypo_length.png + mesh_hypo_segment.png + mesh_hypo_volume.png + mesh_hypo_edit.png + mesh_info.png + advanced_mesh_info.png + standard_mesh_info.png + mesh_elem_info.png + mesh_equal_edge.png + mesh_equal_face.png + mesh_equal_node.png + mesh_equal_volume.png + mesh_whatis.png + mesh_init.png + mesh_length.png + mesh_length_2d.png + mesh_find_elem_by_point.png + mesh_free_edges.png + mesh_free_edges_2d.png + mesh_free_nodes.png + mesh_max_element_length_2d.png + mesh_max_element_length_3d.png + mesh_multi_edges.png + mesh_multi_edges_2d.png + mesh_line_n.png + mesh_line.png + mesh_move_node.png + mesh_octahedron.png + mesh_orientation.png + mesh.png + mesh_polygon.png + mesh_polyhedron.png + mesh_pyramid_n.png + mesh_pyramid.png + mesh_quad_n.png + mesh_quad.png + mesh_quadrangle_quadpref.png + mesh_quadrangle_quadpref_reversed.png + mesh_quadrangle_reduced.png + mesh_quadrangle_standard.png + mesh_quadrangle_triapref.png + mesh_rem_element.png + mesh_rem_node.png + mesh_rem_orphan_nodes.png + mesh_shading.png + mesh_shrink.png + mesh_skew.png + mesh_taper.png + mesh_tetra.png + mesh_tree_algo_hexa.png + mesh_tree_algo_mefisto.png + mesh_tree_algo.png + mesh_tree_algo_0D.png + mesh_tree_algo_quad.png + mesh_tree_algo_regular.png + mesh_tree_algo_tetra.png + mesh_tree_hypo_area.png + mesh_tree_hypo_length.png + mesh_tree_hypo.png + mesh_tree_hypo_segment.png + mesh_tree_hypo_volume.png + mesh_tree_mesh.png + mesh_tree_importedmesh.png + mesh_tree_mesh_warn.png + mesh_triangle_n.png + mesh_triquad_hexahedron.png + mesh_triangle.png + mesh_update.png + mesh_vertex_n.png + mesh_vertex.png + mesh_0D_elem.png + mesh_0D_on_all_nodes.png + mesh_volume_3d.png + bare_border_volume.png + bare_border_face.png + over_constrained_volume.png + over_constrained_face.png + mesh_wireframe.png + mesh_points.png + mesh_wrap.png + mesh_group.png + mesh_tree_group.png + mesh_tree_group_on_filter.png + mesh_edit_group.png + mesh_make_group.png + mesh_groups_from_gemetry.png + mesh_union2tri.png + mesh_uniontri.png + mesh_cutquad.png + mesh_smoothing.png + mesh_renumbering_nodes.png + mesh_renumbering_elements.png + mesh_extrusion.png + mesh_extrusionpath.png + mesh_revolution.png + ModuleMesh.png + mesh_unionGroups.png + mesh_intersectGroups.png + mesh_cutGroups.png + mesh_deleteGroups.png + mesh_translation_vector.png + mesh_translation_points.png + mesh_rotation.png + mesh_symmetry_point.png + mesh_symmetry_axis.png + mesh_symmetry_plane.png + mesh_sew_freeborders.png + mesh_sew_conform_freeborders.png + mesh_sew_bordertoside.png + mesh_sew_sideelements.png + mesh_merge_nodes.png + mesh_merge_elements.png + select1.png + open.png + StdMeshers.xml + mesh_pattern.png + mesh_pentahedron.png + pattern_sample_2d.png + pattern_sample_3D.png + mesh_add.png + mesh_remove.png + mesh_quad_edge.png + mesh_quad_triangle.png + mesh_quad_quadrangle.png + mesh_quad_tetrahedron.png + mesh_quad_pyramid.png + mesh_quad_pentahedron.png + mesh_quad_hexahedron.png + mesh_conv_to_quad.png + mesh_tree_hypo_layers_distribution.png + mesh_tree_algo_radial_prism.png + mesh_tree_algo_radial_quadrangle_1D2D.png + mesh_tree_algo_existing_2D.png + mesh_tree_algo_prism.png + mesh_tree_algo_projection_2d.png + mesh_hypo_source_edge.png + mesh_hypo_source_3d.png + mesh_hypo_layer_distribution.png + mesh_hypo_source_face.png + mesh_tree_hypo_source_face.png + mesh_tree_hypo_source_edge.png + mesh_tree_hypo_source_3d_shape.png + mesh_tree_hypo_projection_3d.png + mesh_tree_hypo_projection_2d.png + mesh_build_compound.png + copy_mesh.png + mesh_node_to_point.png + mesh_tree_mesh_partial.png + mesh_extractGroup.png + mesh_precompute.png + mesh_2d_from_3d.png + mesh_free_faces.png + scale.png + scale_along_axes.png + split_into_tetra.png + mesh_duplicate_nodes.png + mesh_duplicate_nodes_with_elem.png + mesh_duplicate_elem_only.png + mesh_bounding_box.png + mesh_hypo_viscous_layers.png + mesh_tree_hypo_viscous_layers.png + mesh_min_dist.png + reorient_faces_point.png + reorient_faces_face.png + mesh_ball.png + mesh_measure_basic_props.png + mesh_measure_length.png + mesh_measure_area.png + mesh_measure_volume.png +) + +INSTALL(FILES ${SMESH_RESOURCES_FILES} DESTINATION ${SALOME_SMESH_INSTALL_RES_DATA}) + +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SalomeApp.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SalomeApp.xml INSTALL ${SALOME_SMESH_INSTALL_RES_DATA}) +SALOME_CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SMESHCatalog.xml.in ${CMAKE_CURRENT_BINARY_DIR}/SMESHCatalog.xml INSTALL ${SALOME_SMESH_INSTALL_RES_DATA}) diff --git a/resources/Makefile.am b/resources/Makefile.am deleted file mode 100644 index 786c3cd48..000000000 --- a/resources/Makefile.am +++ /dev/null @@ -1,218 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# -* Makefile *- -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# Modified by : Alexander BORODIN (OCN) - autotools usage -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -dist_salomeres_DATA = \ - delete.png \ - mesh_add_sub.png \ - mesh_algo_hexa.png \ - mesh_algo_mefisto.png \ - mesh_algo_quad.png \ - mesh_algo_regular.png \ - mesh_algo_tetra.png \ - mesh_angle.png \ - mesh_area.png \ - mesh_aspect.png \ - mesh_aspect_3d.png \ - mesh_biquad_quadrangle.png \ - mesh_biquad_triangle.png \ - mesh_clear.png \ - mesh_compute.png \ - mesh_diagonal.png \ - mesh_edit.png \ - mesh_hexa.png \ - mesh_hypo_area.png \ - mesh_hypo_length.png \ - mesh_hypo_segment.png \ - mesh_hypo_volume.png \ - mesh_hypo_edit.png \ - mesh_info.png \ - advanced_mesh_info.png \ - standard_mesh_info.png \ - mesh_elem_info.png \ - mesh_equal_edge.png \ - mesh_equal_face.png \ - mesh_equal_node.png \ - mesh_equal_volume.png \ - mesh_whatis.png \ - mesh_init.png \ - mesh_length.png \ - mesh_length_2d.png \ - mesh_find_elem_by_point.png \ - mesh_free_edges.png \ - mesh_free_edges_2d.png \ - mesh_free_nodes.png \ - mesh_max_element_length_2d.png \ - mesh_max_element_length_3d.png \ - mesh_multi_edges.png \ - mesh_multi_edges_2d.png \ - mesh_line_n.png \ - mesh_line.png \ - mesh_move_node.png \ - mesh_octahedron.png \ - mesh_orientation.png \ - mesh.png \ - mesh_polygon.png \ - mesh_polyhedron.png \ - mesh_pyramid_n.png \ - mesh_pyramid.png \ - mesh_quad_n.png \ - mesh_quad.png \ - mesh_quadrangle_quadpref.png \ - mesh_quadrangle_quadpref_reversed.png \ - mesh_quadrangle_reduced.png \ - mesh_quadrangle_standard.png \ - mesh_quadrangle_triapref.png \ - mesh_rem_element.png \ - mesh_rem_node.png \ - mesh_rem_orphan_nodes.png \ - mesh_shading.png \ - mesh_shrink.png \ - mesh_skew.png \ - mesh_taper.png \ - mesh_tetra.png \ - mesh_tree_algo_hexa.png \ - mesh_tree_algo_mefisto.png \ - mesh_tree_algo.png \ - mesh_tree_algo_0D.png \ - mesh_tree_algo_quad.png \ - mesh_tree_algo_regular.png \ - mesh_tree_algo_tetra.png \ - mesh_tree_hypo_area.png \ - mesh_tree_hypo_length.png \ - mesh_tree_hypo.png \ - mesh_tree_hypo_segment.png \ - mesh_tree_hypo_volume.png \ - mesh_tree_mesh.png \ - mesh_tree_importedmesh.png \ - mesh_tree_mesh_warn.png \ - mesh_triangle_n.png \ - mesh_triquad_hexahedron.png \ - mesh_triangle.png \ - mesh_update.png \ - mesh_vertex_n.png \ - mesh_vertex.png \ - mesh_0D_elem.png \ - mesh_0D_on_all_nodes.png \ - mesh_volume_3d.png \ - bare_border_volume.png \ - bare_border_face.png \ - over_constrained_volume.png \ - over_constrained_face.png \ - mesh_wireframe.png \ - mesh_points.png \ - mesh_wrap.png \ - mesh_group.png \ - mesh_tree_group.png \ - mesh_tree_group_on_filter.png \ - mesh_edit_group.png \ - mesh_make_group.png \ - mesh_groups_from_gemetry.png \ - mesh_union2tri.png \ - mesh_uniontri.png \ - mesh_cutquad.png \ - mesh_smoothing.png \ - mesh_renumbering_nodes.png \ - mesh_renumbering_elements.png \ - mesh_extrusion.png \ - mesh_extrusionpath.png \ - mesh_revolution.png \ - ModuleMesh.png \ - mesh_unionGroups.png \ - mesh_intersectGroups.png \ - mesh_cutGroups.png \ - mesh_deleteGroups.png \ - mesh_translation_vector.png \ - mesh_translation_points.png \ - mesh_rotation.png \ - mesh_symmetry_point.png \ - mesh_symmetry_axis.png \ - mesh_symmetry_plane.png \ - mesh_sew_freeborders.png \ - mesh_sew_conform_freeborders.png \ - mesh_sew_bordertoside.png \ - mesh_sew_sideelements.png \ - mesh_merge_nodes.png \ - mesh_merge_elements.png \ - select1.png \ - open.png \ - StdMeshers.xml \ - mesh_pattern.png \ - mesh_pentahedron.png \ - pattern_sample_2d.png \ - pattern_sample_3D.png \ - mesh_add.png \ - mesh_remove.png \ - mesh_quad_edge.png \ - mesh_quad_triangle.png \ - mesh_quad_quadrangle.png \ - mesh_quad_tetrahedron.png \ - mesh_quad_pyramid.png \ - mesh_quad_pentahedron.png \ - mesh_quad_hexahedron.png \ - mesh_conv_to_quad.png \ - mesh_tree_hypo_layers_distribution.png \ - mesh_tree_algo_radial_prism.png \ - mesh_tree_algo_radial_quadrangle_1D2D.png \ - mesh_tree_algo_existing_2D.png \ - mesh_tree_algo_prism.png \ - mesh_tree_algo_projection_2d.png \ - mesh_hypo_source_edge.png \ - mesh_hypo_source_3d.png \ - mesh_hypo_layer_distribution.png \ - mesh_hypo_source_face.png \ - mesh_tree_hypo_source_face.png \ - mesh_tree_hypo_source_edge.png \ - mesh_tree_hypo_source_3d_shape.png \ - mesh_tree_hypo_projection_3d.png \ - mesh_tree_hypo_projection_2d.png \ - mesh_build_compound.png \ - copy_mesh.png \ - mesh_node_to_point.png \ - mesh_tree_mesh_partial.png \ - mesh_extractGroup.png \ - mesh_precompute.png \ - mesh_2d_from_3d.png \ - mesh_free_faces.png \ - scale.png \ - scale_along_axes.png \ - split_into_tetra.png \ - mesh_duplicate_nodes.png \ - mesh_duplicate_nodes_with_elem.png \ - mesh_duplicate_elem_only.png \ - mesh_bounding_box.png \ - mesh_hypo_viscous_layers.png \ - mesh_tree_hypo_viscous_layers.png \ - mesh_min_dist.png \ - reorient_faces_point.png \ - reorient_faces_face.png \ - mesh_ball.png \ - mesh_measure_basic_props.png \ - mesh_measure_length.png \ - mesh_measure_area.png \ - mesh_measure_volume.png - -# VSR: little trick to avoid putting if SMESHCatalog.xml to the distribution archive -nodist_salomeres_SCRIPTS = SMESHCatalog.xml SalomeApp.xml diff --git a/resources/SMESHCatalog.xml.in b/resources/SMESHCatalog.xml.in index 4b5e1a80b..cabb43fb9 100644 --- a/resources/SMESHCatalog.xml.in +++ b/resources/SMESHCatalog.xml.in @@ -44,7 +44,7 @@ Mesh MESH NRI - @VERSION@ + @SALOMESMESH_VERSION@ Mesh component 1 ModuleMesh.png diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index eb9038f15..354739600 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -26,7 +26,7 @@ - + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100755 index 000000000..9ef95077a --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,95 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +## +# Common packages +## +SET(SUBDIRS_COMMON + SMDS + SMESHDS + SMESHUtils + Controls + Driver + MEDWrapper + DriverMED + DriverDAT + DriverUNV + DriverSTL + DriverGMF + SMESH + SMESH_I + SMESHClient + SMESH_SWIG + MEFISTO2 + StdMeshers + StdMeshers_I + SMESH_PY + Tools +) + +## +# CGNS +## +IF(SALOME_SMESH_USE_CGNS) + SET(SUBDIRS_CGNS + DriverCGNS + ) +ENDIF(SALOME_SMESH_USE_CGNS) + +## +# GUI +## +IF(SALOME_BUILD_GUI) + SET(SUBDIRS_GUI OBJECT + SMESHFiltersSelection + SMESHGUI + PluginUtils + SMESH_SWIG_WITHIHM + StdMeshersGUI + ) +ENDIF(SALOME_BUILD_GUI) + +SET(SUBDIRS + ${SUBDIRS_COMMON} + ${SUBDIRS_CGNS} + ${SUBDIRS_GUI} +) + +FOREACH(dir ${SUBDIRS}) + ADD_SUBDIRECTORY(${dir}) +ENDFOREACH(dir ${SUBDIRS}) diff --git a/src/Controls/CMakeLists.txt b/src/Controls/CMakeLists.txt new file mode 100644 index 000000000..b33396148 --- /dev/null +++ b/src/Controls/CMakeLists.txt @@ -0,0 +1,95 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${VTK_LIBRARIES} + ${CAS_TKernel} + ${CAS_TKBRep} + ${CAS_TKG3d} + ${CAS_TKTopAlgo} + ${CAS_TKGeomBase} + ${CAS_TKGeomAlgo} + SMDS + SMESHDS + SMESHUtils +) + +SET(_link_LIBRARIES_bin + ${KERNEL_OpUtil} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeIDLKERNEL} + ${GEOM_GEOMAlgo} + ${CAS_TKernel} + ${CAS_TKBRep} + ${CAS_TKG3d} + SMDS + SMESHDS +) + +# --- headers --- + +# header files / no moc processing +SET(SMESHControls_HEADERS + SMESH_ControlsDef.hxx +) + +# --- sources --- + +# sources / static +SET(SMESHControls_SOURCES + SMESH_Controls.cxx +) + +# bin programs +SET(SMESHControls_bin_SOURCES + SMESHControls.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMESHControls ${SMESHControls_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHControls ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESHControls EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(SMESHControls_bin ${SMESHControls_bin_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHControls_bin ${_link_LIBRARIES_bin} SMESHControls) +SET_TARGET_PROPERTIES(SMESHControls_bin PROPERTIES OUTPUT_NAME "SMESHControls") +INSTALL(TARGETS SMESHControls_bin EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${SMESHControls_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/Controls/Makefile.am b/src/Controls/Makefile.am deleted file mode 100644 index bf1c1d902..000000000 --- a/src/Controls/Makefile.am +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESH_ControlsDef.hxx - -# Libraries targets -lib_LTLIBRARIES = libSMESHControls.la - -dist_libSMESHControls_la_SOURCES = \ - SMESH_Controls.cxx - -# Executables targets -bin_PROGRAMS = SMESHControls -dist_SMESHControls_SOURCES = \ - SMESHControls.cxx - -# additionnal information to compil and link file -libSMESHControls_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../SMESHUtils - -libSMESHControls_la_LDFLAGS = \ - ../SMDS/libSMDS.la \ - ../SMESHDS/libSMESHDS.la \ - ../SMESHUtils/libSMESHUtils.la \ - $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo \ - $(VTK_LIBS) \ - $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics - -SMESHControls_CPPFLAGS = \ - $(libSMESHControls_la_CPPFLAGS) - - -SMESHControls_LDADD = \ - ../SMDS/libSMDS.la \ - ../SMESHDS/libSMESHDS.la \ - libSMESHControls.la \ - $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeIDLKernel \ - $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d diff --git a/src/Driver/CMakeLists.txt b/src/Driver/CMakeLists.txt new file mode 100644 index 000000000..feebd7ede --- /dev/null +++ b/src/Driver/CMakeLists.txt @@ -0,0 +1,70 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${Boost_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESHDS +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_OpUtil} + ${CAS_TKernel} + ${CAS_TKTopAlgo} + SMESHDS +) + +# --- headers --- + +# header files / no moc processing +SET(MeshDriver_HEADERS + Driver_Document.h + Driver_Mesh.h + Driver_SMDS_Mesh.h + Driver_SMESHDS_Mesh.h +) + +# --- sources --- + +# sources / static +SET(MeshDriver_SOURCES + Driver_Document.cxx + Driver_Mesh.cxx + Driver_SMDS_Mesh.cxx + Driver_SMESHDS_Mesh.cxx +) + +# --- rules --- + +ADD_LIBRARY(MeshDriver ${MeshDriver_SOURCES}) +TARGET_LINK_LIBRARIES(MeshDriver ${_link_LIBRARIES} ) +INSTALL(TARGETS MeshDriver EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${MeshDriver_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/Driver/Makefile.am b/src/Driver/Makefile.am deleted file mode 100644 index 5327e2483..000000000 --- a/src/Driver/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH Driver : implementaion of driver for reading and writing -# File : Makefile.in -# Author : Marc Tajchman (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# $Header$ -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - Driver_Document.h \ - Driver_Mesh.h \ - Driver_SMDS_Mesh.h \ - Driver_SMESHDS_Mesh.h - -# Libraries targets -lib_LTLIBRARIES = libMeshDriver.la - -dist_libMeshDriver_la_SOURCES = \ - Driver_Document.cxx \ - Driver_Mesh.cxx \ - Driver_SMDS_Mesh.cxx \ - Driver_SMESHDS_Mesh.cxx - -# additionnal information to compil and link file -libMeshDriver_la_CPPFLAGS = \ - $(BOOST_CPPFLAGS) \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMESHDS - -libMeshDriver_la_LDFLAGS = \ - ../SMESHDS/libSMESHDS.la \ - $(KERNEL_LDFLAGS) -lOpUtil \ - $(CAS_LDPATH) -lTKernel -lTKTopAlgo diff --git a/src/DriverCGNS/CMakeLists.txt b/src/DriverCGNS/CMakeLists.txt new file mode 100644 index 000000000..73ddb157f --- /dev/null +++ b/src/DriverCGNS/CMakeLists.txt @@ -0,0 +1,70 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${CGNS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESHDS +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CGNS_LIBRARIES} + MeshDriver + SMESHUtils +) + +# --- headers --- + +# header files / no moc processing +SET(MeshDriverCGNS_HEADERS + DriverCGNS_Read.hxx + DriverCGNS_Write.hxx + SMESH_DriverCGNS.hxx +) + +# --- sources --- + +# sources / static +SET(MeshDriverCGNS_SOURCES + DriverCGNS_Read.cxx + DriverCGNS_Write.cxx +) + +# --- rules --- + +ADD_LIBRARY(MeshDriverCGNS ${MeshDriverCGNS_SOURCES}) +TARGET_LINK_LIBRARIES(MeshDriverCGNS ${_link_LIBRARIES} ) +INSTALL(TARGETS MeshDriverCGNS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${MeshDriverCGNS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/DriverCGNS/Makefile.am b/src/DriverCGNS/Makefile.am deleted file mode 100644 index 4fb05669a..000000000 --- a/src/DriverCGNS/Makefile.am +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DriverCGNS_Read.hxx \ - DriverCGNS_Write.hxx \ - SMESH_DriverCGNS.hxx - -# Libraries targets -lib_LTLIBRARIES = libMeshDriverCGNS.la -dist_libMeshDriverCGNS_la_SOURCES = \ - DriverCGNS_Read.cxx \ - DriverCGNS_Write.cxx - -# additionnal information to compil and link file -libMeshDriverCGNS_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(CGNS_INCLUDES) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS - -libMeshDriverCGNS_la_LDFLAGS = \ - $(BOOST_LIBS) \ - $(CGNS_LIBS) \ - ../Driver/libMeshDriver.la \ - ../SMESHUtils/libSMESHUtils.la diff --git a/src/DriverDAT/CMakeLists.txt b/src/DriverDAT/CMakeLists.txt new file mode 100644 index 000000000..df32ce347 --- /dev/null +++ b/src/DriverDAT/CMakeLists.txt @@ -0,0 +1,88 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESHDS +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeIDLKERNEL} + MeshDriver +) + +SET(_link_LIBRARIES_bin + ${KERNEL_OpUtil} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeIDLKERNEL} + MeshDriver + SMDS +) + +# --- headers --- + +# header files / no moc processing +SET(MeshDriverDAT_HEADERS + DriverDAT_R_SMDS_Mesh.h + DriverDAT_W_SMDS_Mesh.h + SMESH_DriverDAT.hxx +) + +# --- sources --- + +# sources / static +SET(MeshDriverDAT_SOURCES + DriverDAT_R_SMDS_Mesh.cxx + DriverDAT_W_SMDS_Mesh.cxx +) + +# bin programs +SET(MeshDriverDAT_bin_SOURCES + DAT_Test.cxx +) + +# --- rules --- + +ADD_LIBRARY(MeshDriverDAT ${MeshDriverDAT_SOURCES}) +TARGET_LINK_LIBRARIES(MeshDriverDAT ${_link_LIBRARIES} ) +INSTALL(TARGETS MeshDriverDAT EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(DAT_Test ${MeshDriverDAT_bin_SOURCES}) +TARGET_LINK_LIBRARIES(DAT_Test ${_link_LIBRARIES_bin} MeshDriverDAT) +INSTALL(TARGETS DAT_Test EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${MeshDriverDAT_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/DriverDAT/Makefile.am b/src/DriverDAT/Makefile.am deleted file mode 100644 index c5180bfa6..000000000 --- a/src/DriverDAT/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH DriverDAT : driver to read and write 'dat' files -# File : Makefile.in -# Author : Marc Tajchman (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# $Header$ -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DriverDAT_R_SMDS_Mesh.h \ - DriverDAT_W_SMDS_Mesh.h \ - SMESH_DriverDAT.hxx - -# Libraries targets -lib_LTLIBRARIES = libMeshDriverDAT.la - -dist_libMeshDriverDAT_la_SOURCES = \ - DriverDAT_R_SMDS_Mesh.cxx \ - DriverDAT_W_SMDS_Mesh.cxx - -# Executables targets -bin_PROGRAMS = DAT_Test -dist_DAT_Test_SOURCES = \ - DAT_Test.cxx - -# additionnal information to compil and link file -libMeshDriverDAT_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMESHDS - -libMeshDriverDAT_la_LDFLAGS = \ - ../Driver/libMeshDriver.la \ - $(KERNEL_LDFLAGS) -lSALOMEBasics -lSalomeIDLKernel \ - $(CAS_KERNEL) - -DAT_Test_CPPFLAGS = \ - $(libMeshDriverDAT_la_CPPFLAGS) - -DAT_Test_LDADD = \ - libMeshDriverDAT.la \ - ../Driver/libMeshDriver.la \ - ../SMDS/libSMDS.la \ - $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeIDLKernel - diff --git a/src/DriverGMF/CMakeLists.txt b/src/DriverGMF/CMakeLists.txt new file mode 100644 index 000000000..c5a3bc7a7 --- /dev/null +++ b/src/DriverGMF/CMakeLists.txt @@ -0,0 +1,74 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESHDS +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} + "-DBOOST_SYSTEM_NO_DEPRECATED" +) + +SET(_link_LIBRARIES + ${Boost_LIBRARIES} + ${KERNEL_SALOMEBasics} + MeshDriver + SMESHUtils +) + +# --- headers --- + +# header files / no moc processing +SET(MeshDriverGMF_HEADERS + DriverGMF_Read.hxx + DriverGMF_Write.hxx + DriverGMF.hxx + SMESH_DriverGMF.hxx + libmesh5.h +) + +# --- sources --- + +# sources / static +SET(MeshDriverGMF_SOURCES + DriverGMF_Read.cxx + DriverGMF_Write.cxx + DriverGMF.cxx + libmesh5.c +) + +# --- rules --- + +ADD_LIBRARY(MeshDriverGMF ${MeshDriverGMF_SOURCES}) +TARGET_LINK_LIBRARIES(MeshDriverGMF ${_link_LIBRARIES} ) +INSTALL(TARGETS MeshDriverGMF EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${MeshDriverGMF_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/DriverGMF/Makefile.am b/src/DriverGMF/Makefile.am deleted file mode 100644 index caef1da83..000000000 --- a/src/DriverGMF/Makefile.am +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DriverGMF_Read.hxx \ - DriverGMF_Write.hxx \ - DriverGMF.hxx \ - SMESH_DriverGMF.hxx \ - libmesh5.h - -# Libraries targets -lib_LTLIBRARIES = libMeshDriverGMF.la -dist_libMeshDriverGMF_la_SOURCES = \ - DriverGMF_Read.cxx \ - DriverGMF_Write.cxx \ - DriverGMF.cxx \ - libmesh5.c - -# additionnal information to compil and link file -libMeshDriverGMF_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) -DBOOST_SYSTEM_NO_DEPRECATED \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS - -libMeshDriverGMF_la_LDFLAGS = \ - $(BOOST_LIBS) -lboost_filesystem$(BOOST_LIBSUFFIX) \ - ../Driver/libMeshDriver.la \ - ../SMESHUtils/libSMESHUtils.la \ - $(KERNEL_LDFLAGS) -lSALOMEBasics diff --git a/src/DriverMED/CMakeLists.txt b/src/DriverMED/CMakeLists.txt new file mode 100644 index 000000000..8d4d58a05 --- /dev/null +++ b/src/DriverMED/CMakeLists.txt @@ -0,0 +1,98 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${HDF5_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base + ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Factory + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESHDS +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${HDF5_DEFINITIONS} + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${Boost_LIBRARIES} + MeshDriver + MEDWrapper + MEDWrapperBase + MEDWrapper_V2_2 +) + +SET(_link_LIBRARIES_bin + ${_link_LIBRARIES} + ${KERNEL_OpUtil} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeIDLKERNEL} + SMDS + SMESHDS +) + +# --- headers --- + +# header files / no moc processing +SET(MeshDriverMED_HEADERS + DriverMED.hxx + DriverMED_R_SMESHDS_Mesh.h + DriverMED_W_SMESHDS_Mesh.h + DriverMED_Family.h + SMESH_DriverMED.hxx +) + +# --- sources --- + +# sources / static +SET(MeshDriverMED_SOURCES + DriverMED_R_SMESHDS_Mesh.cxx + DriverMED_W_SMESHDS_Mesh.cxx + DriverMED_Family.cxx +) + +# bin programs +SET(MeshDriverMED_bin_SOURCES + MED_Test.cxx +) + +# --- rules --- + +ADD_LIBRARY(MeshDriverMED ${MeshDriverMED_SOURCES}) +TARGET_LINK_LIBRARIES(MeshDriverMED ${_link_LIBRARIES} ) +INSTALL(TARGETS MeshDriverMED EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(MED_Test_bin ${MeshDriverMED_bin_SOURCES}) +TARGET_LINK_LIBRARIES(MED_Test_bin ${_link_LIBRARIES_bin} MeshDriverMED) +SET_TARGET_PROPERTIES(MED_Test_bin PROPERTIES OUTPUT_NAME "MED_Test") +INSTALL(TARGETS MED_Test_bin EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${MeshDriverMED_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/DriverMED/Makefile.am b/src/DriverMED/Makefile.am deleted file mode 100644 index 95b5a0153..000000000 --- a/src/DriverMED/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com - -# SMESH DriverMED : driver to read and write 'med' files -# File : Makefile.in -# Author : Marc Tajchman (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DriverMED.hxx \ - DriverMED_R_SMESHDS_Mesh.h \ - DriverMED_W_SMESHDS_Mesh.h \ - DriverMED_Family.h \ - SMESH_DriverMED.hxx - -# Libraries targets -lib_LTLIBRARIES = libMeshDriverMED.la -dist_libMeshDriverMED_la_SOURCES = \ - DriverMED_R_SMESHDS_Mesh.cxx \ - DriverMED_W_SMESHDS_Mesh.cxx \ - DriverMED_Family.cxx - -# Executables targets -bin_PROGRAMS = MED_Test - -dist_MED_Test_SOURCES = \ - MED_Test.cxx - - -# additionnal information to compil and link file -libMeshDriverMED_la_CPPFLAGS = \ - @HDF5_INCLUDES@ \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../MEDWrapper/Base \ - -I$(srcdir)/../MEDWrapper/Factory \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMESHDS - -libMeshDriverMED_la_LDFLAGS = \ - $(BOOST_LIBS) \ - ../Driver/libMeshDriver.la \ - ../MEDWrapper/Factory/libMEDWrapper.la \ - ../MEDWrapper/Base/libMEDWrapperBase.la \ - ../MEDWrapper/V2_2/libMEDWrapper_V2_2.la \ - $(BOOST_LIB_SYSTEM) - -MED_Test_CPPFLAGS = \ - $(libMeshDriverMED_la_CPPFLAGS) - -MED_Test_LDADD = \ - libMeshDriverMED.la \ - ../Driver/libMeshDriver.la \ - ../SMDS/libSMDS.la \ - ../SMESHDS/libSMESHDS.la \ - ${BOOST_LIB_SYSTEM} \ - $(KERNEL_LDFLAGS) \ - -lOpUtil \ - -lSALOMELocalTrace \ - -lSALOMEBasics \ - -lSalomeIDLKernel \ - ../MEDWrapper/Factory/libMEDWrapper.la \ - ../MEDWrapper/Base/libMEDWrapperBase.la \ - ../MEDWrapper/V2_2/libMEDWrapper_V2_2.la \ - $(BOOST_LIB_SYSTEM) diff --git a/src/DriverSTL/CMakeLists.txt b/src/DriverSTL/CMakeLists.txt new file mode 100644 index 000000000..71abee231 --- /dev/null +++ b/src/DriverSTL/CMakeLists.txt @@ -0,0 +1,96 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESH +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKernel} + ${CAS_TKSTL} + ${CAS_TKTopAlgo} + ${CAS_TKMesh} + ${KERNEL_SALOMEBasics} + MeshDriver + SMDS +) + +SET(_link_LIBRARIES_bin + ${KERNEL_OpUtil} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeIDLKERNEL} + ${CAS_TKernel} + ${CAS_TKSTL} + ${CAS_TKTopAlgo} + ${CAS_TKMesh} + ${CAS_TKBO} + MeshDriver + SMDS +) + +# --- headers --- + +# header files / no moc processing +SET(MeshDriverSTL_HEADERS + DriverSTL_R_SMDS_Mesh.h + DriverSTL_W_SMDS_Mesh.h + SMESH_DriverSTL.hxx +) + +# --- sources --- + +# sources / static +SET(MeshDriverSTL_SOURCES + DriverSTL_R_SMDS_Mesh.cxx + DriverSTL_W_SMDS_Mesh.cxx +) + +# bin programs +SET(STL_Test_SOURCES + STL_Test.cxx +) + +# --- rules --- + +ADD_LIBRARY(MeshDriverSTL ${MeshDriverSTL_SOURCES}) +TARGET_LINK_LIBRARIES(MeshDriverSTL ${_link_LIBRARIES} ) +INSTALL(TARGETS MeshDriverSTL EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(STL_Test ${STL_Test_SOURCES}) +TARGET_LINK_LIBRARIES(STL_Test ${_link_LIBRARIES_bin} MeshDriverSTL) +INSTALL(TARGETS STL_Test EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${MeshDriverSTL_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/DriverSTL/Makefile.am b/src/DriverSTL/Makefile.am deleted file mode 100644 index 3e3864f43..000000000 --- a/src/DriverSTL/Makefile.am +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH DriverSTL : driver to read and write 'stl' files -# File : Makefile.in -# Author : Marc Tajchman (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# $Header$ -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DriverSTL_R_SMDS_Mesh.h \ - DriverSTL_W_SMDS_Mesh.h \ - SMESH_DriverSTL.hxx - -# Libraries targets -lib_LTLIBRARIES = libMeshDriverSTL.la - -dist_libMeshDriverSTL_la_SOURCES = \ - DriverSTL_R_SMDS_Mesh.cxx \ - DriverSTL_W_SMDS_Mesh.cxx - -# Executables targets -bin_PROGRAMS = STL_Test - -dist_STL_Test_SOURCES = \ - STL_Test.cxx - - -# additionnal information to compil and link file -libMeshDriverSTL_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../SMESH \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMDS - -libMeshDriverSTL_la_LDFLAGS = \ - ../Driver/libMeshDriver.la \ - ../SMDS/libSMDS.la \ - $(KERNEL_LDFLAGS) -lSALOMEBasics \ - $(CAS_LDPATH) -lTKernel -lTKSTL -lTKTopAlgo -lTKMesh - -STL_Test_CPPFLAGS = \ - $(libMeshDriverSTL_la_CPPFLAGS) - -STL_Test_LDADD = \ - libMeshDriverSTL.la \ - ../Driver/libMeshDriver.la \ - ../SMDS/libSMDS.la \ - $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeIDLKernel \ - $(CAS_LDPATH) -lTKernel -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO - diff --git a/src/DriverUNV/CMakeLists.txt b/src/DriverUNV/CMakeLists.txt new file mode 100644 index 000000000..0e6b2f16b --- /dev/null +++ b/src/DriverUNV/CMakeLists.txt @@ -0,0 +1,94 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESHDS +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} + ${KERNEL_SALOMEBasics} + MeshDriver +) + +SET(_link_LIBRARIES_bin + ${KERNEL_OpUtil} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeIDLKERNEL} + MeshDriver + SMDS +) + +# --- headers --- + +# header files / no moc processing +SET(MeshDriverUNV_HEADERS + DriverUNV_R_SMDS_Mesh.h + DriverUNV_W_SMDS_Mesh.h + SMESH_DriverUNV.hxx +) + +# --- sources --- + +# sources / static +SET(MeshDriverUNV_SOURCES + DriverUNV_R_SMDS_Mesh.cxx + DriverUNV_W_SMDS_Mesh.cxx + UNV_Utilities.cxx + UNV164_Structure.cxx + UNV2411_Structure.cxx + UNV2412_Structure.cxx + UNV2420_Structure.cxx + UNV2417_Structure.cxx + +) + +# bin programs +SET(UNV_Test_SOURCES + UNV_Test.cxx +) + +# --- rules --- + +ADD_LIBRARY(MeshDriverUNV ${MeshDriverUNV_SOURCES}) +TARGET_LINK_LIBRARIES(MeshDriverUNV ${_link_LIBRARIES} ) +INSTALL(TARGETS MeshDriverUNV EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(UNV_Test ${UNV_Test_SOURCES}) +TARGET_LINK_LIBRARIES(UNV_Test ${_link_LIBRARIES_bin} MeshDriverUNV) +INSTALL(TARGETS UNV_Test EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${MeshDriverUNV_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/DriverUNV/Makefile.am b/src/DriverUNV/Makefile.am deleted file mode 100644 index 0be78fe5b..000000000 --- a/src/DriverUNV/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH DriverUNV : driver to read and write 'unv' files -# File : Makefile.in -# Author : Marc Tajchman (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# $Header$ -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - DriverUNV_R_SMDS_Mesh.h \ - DriverUNV_W_SMDS_Mesh.h \ - SMESH_DriverUNV.hxx - -# not-exported (internal) files -EXTRA_DIST += \ - UNV164_Structure.hxx \ - UNV2411_Structure.hxx \ - UNV2412_Structure.hxx \ - UNV2417_Structure.hxx \ - UNV2420_Structure.hxx \ - UNV_Utilities.hxx - -# Libraries targets -lib_LTLIBRARIES = libMeshDriverUNV.la -dist_libMeshDriverUNV_la_SOURCES = \ - DriverUNV_R_SMDS_Mesh.cxx \ - DriverUNV_W_SMDS_Mesh.cxx \ - UNV_Utilities.cxx \ - UNV164_Structure.cxx \ - UNV2411_Structure.cxx \ - UNV2412_Structure.cxx \ - UNV2420_Structure.cxx \ - UNV2417_Structure.cxx - -# Executables targets -bin_PROGRAMS = UNV_Test - -UNV_Test_SOURCES = \ - UNV_Test.cxx - -# additionnal information to compil and link file -libMeshDriverUNV_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMESHDS - -libMeshDriverUNV_la_LDFLAGS = \ - ../Driver/libMeshDriver.la \ - $(KERNEL_LDFLAGS) -lSALOMEBasics \ - $(CAS_KERNEL) - -UNV_Test_CPPFLAGS = \ - $(libMeshDriverUNV_la_CPPFLAGS) - -UNV_Test_LDADD = \ - libMeshDriverUNV.la \ - ../Driver/libMeshDriver.la \ - ../SMDS/libSMDS.la \ - $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeIDLKernel diff --git a/src/MEDWrapper/Base/CMakeLists.txt b/src/MEDWrapper/Base/CMakeLists.txt index 2d7fe409d..d8daa39e4 100644 --- a/src/MEDWrapper/Base/CMakeLists.txt +++ b/src/MEDWrapper/Base/CMakeLists.txt @@ -17,17 +17,48 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +# --- options --- +# additional include directories INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} ) -IF(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) -ELSE(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel) -ENDIF(MED_ENABLE_KERNEL) +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${HDF5_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +SET(_link_LIBRARIES + ${Boost_LIBRARIES} +) + +# --- headers --- +# header files / no moc processing +SET(MEDWrapperBase_HEADERS + MED_Common.hxx + MED_Vector.hxx + MED_SharedPtr.hxx + MED_SliceArray.hxx + MED_Wrapper.hxx + MED_TWrapper.hxx + MED_Structures.hxx + MED_TStructures.hxx + MED_Algorithm.hxx + MED_GaussUtils.hxx + MED_CoordUtils.hxx + MED_Utilities.hxx + MED_GaussDef.hxx + MED_WrapperBase.hxx +) + +# --- sources --- + +# sources / static SET(MEDWrapperBase_SOURCES MED_Structures.cxx MED_Wrapper.cxx @@ -36,12 +67,12 @@ SET(MEDWrapperBase_SOURCES MED_CoordUtils.cxx MED_Utilities.cxx MED_GaussDef.cxx - ) +) -ADD_LIBRARY(MEDWrapperBase SHARED ${MEDWrapperBase_SOURCES}) -SET_TARGET_PROPERTIES(MEDWrapperBase PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -TARGET_LINK_LIBRARIES(MEDWrapperBase ${BOOST_LIB_THREAD} ${BOOST_LIB_DATE_TIME}) -INSTALL(TARGETS MEDWrapperBase DESTINATION ${MED_salomelib_LIBS}) +# --- rules --- + +ADD_LIBRARY(MEDWrapperBase ${MEDWrapperBase_SOURCES}) +TARGET_LINK_LIBRARIES(MEDWrapperBase ${_link_LIBRARIES}) +INSTALL(TARGETS MEDWrapperBase EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -FILE(GLOB MEDWrapperBase_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") -INSTALL(FILES ${MEDWrapperBase_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) +INSTALL(FILES ${MEDWrapperBase_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEDWrapper/Base/Makefile.am b/src/MEDWrapper/Base/Makefile.am deleted file mode 100644 index 8594ce7fc..000000000 --- a/src/MEDWrapper/Base/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -lib_LTLIBRARIES= libMEDWrapperBase.la - -salomeinclude_HEADERS= \ - MED_Common.hxx \ - MED_Vector.hxx \ - MED_SharedPtr.hxx \ - MED_SliceArray.hxx \ - MED_Wrapper.hxx \ - MED_TWrapper.hxx \ - MED_Structures.hxx \ - MED_TStructures.hxx \ - MED_Algorithm.hxx \ - MED_GaussUtils.hxx \ - MED_CoordUtils.hxx \ - MED_Utilities.hxx \ - MED_GaussDef.hxx \ - MED_WrapperBase.hxx - -dist_libMEDWrapperBase_la_SOURCES= \ - MED_Structures.cxx \ - MED_Wrapper.cxx \ - MED_Algorithm.cxx \ - MED_GaussUtils.cxx \ - MED_CoordUtils.cxx \ - MED_Utilities.cxx \ - MED_GaussDef.cxx - -libMEDWrapperBase_la_CPPFLAGS= $(BOOST_CPPFLAGS) $(HDF5_INCLUDES) -D@MACHINE@ -libMEDWrapperBase_la_CPPFLAGS+= -I$(KERNEL_ROOT_DIR)/include/salome -libMEDWrapperBase_la_CPPFLAGS+= $(MED_CPPFLAGS) -libMEDWrapperBase_la_LDFLAGS= $(BOOST_LIB_THREAD) $(BOOST_LIB_SYSTEM) $(BOOST_LIB_DATE_TIME) diff --git a/src/MEDWrapper/Factory/CMakeLists.txt b/src/MEDWrapper/Factory/CMakeLists.txt index 08cd75cef..69aa1eb57 100644 --- a/src/MEDWrapper/Factory/CMakeLists.txt +++ b/src/MEDWrapper/Factory/CMakeLists.txt @@ -17,41 +17,57 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +# --- options --- +# additional include directories INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} - ${MED3_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../Base ${CMAKE_CURRENT_SOURCE_DIR}/../V2_2 - ) +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${HDF5_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +SET(_link_LIBRARIES + MEDWrapperBase + MEDWrapper_V2_2 + ${Boost_LIBRARIES} + ${MEDFILE_C_LIBRARIES} +) -IF(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) -ELSE(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel) -ENDIF(MED_ENABLE_KERNEL) +# --- headers --- +# header files / no moc processing +SET(MEDWrapper_HEADERS + MED_Factory.hxx + MED_WrapperFactory.hxx +) + +# --- sources --- + +# sources / static SET(MEDWrapper_SOURCES MED_Factory.cxx ) -SET(mprint_version_SOURCES - mprint_version.cxx - ) +# --- rules --- + +ADD_LIBRARY(MEDWrapper ${MEDWrapper_SOURCES}) +TARGET_LINK_LIBRARIES(MEDWrapper ${_link_LIBRARIES} ${MED_medloader} ) +INSTALL(TARGETS MEDWrapper EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -ADD_LIBRARY(MEDWrapper SHARED ${MEDWrapper_SOURCES}) -SET_TARGET_PROPERTIES(MEDWrapper PROPERTIES COMPILE_FLAGS "${BOOST_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -TARGET_LINK_LIBRARIES(MEDWrapper MEDWrapper_V2_2) -INSTALL(TARGETS MEDWrapper DESTINATION ${MED_salomelib_LIBS}) +ADD_EXECUTABLE(mprint_version mprint_version.cxx) +TARGET_LINK_LIBRARIES(mprint_version ${_link_LIBRARIES} MEDWrapper) -ADD_EXECUTABLE(mprint_version ${mprint_version_SOURCES}) -SET_TARGET_PROPERTIES(mprint_version PROPERTIES COMPILE_FLAGS "${BOOST_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -TARGET_LINK_LIBRARIES(mprint_version MEDWrapper MEDWrapper_V2_2 MEDWrapperBase ${BOOST_LIBS} ${MED3_LIBS_C_ONLY}) +ADD_EXECUTABLE(MED_Test MED_Test.cxx) +TARGET_LINK_LIBRARIES(MED_Test ${_link_LIBRARIES} MEDWrapper) -ADD_EXECUTABLE(MED_Test ${mprint_version_SOURCES}) -SET_TARGET_PROPERTIES(MED_Test PROPERTIES COMPILE_FLAGS "${BOOST_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -TARGET_LINK_LIBRARIES(MED_Test MEDWrapper MEDWrapper_V2_2 MEDWrapperBase ${BOOST_LIBS}) +INSTALL(TARGETS mprint_version MED_Test EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) -FILE(GLOB MEDWrapper_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") -INSTALL(FILES ${MEDWrapper_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) -INSTALL(TARGETS mprint_version MED_Test DESTINATION ${MED_salomebin_BINS}) +INSTALL(FILES ${MEDWrapper_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEDWrapper/Factory/Makefile.am b/src/MEDWrapper/Factory/Makefile.am deleted file mode 100644 index ac22c2988..000000000 --- a/src/MEDWrapper/Factory/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -lib_LTLIBRARIES= libMEDWrapper.la - -salomeinclude_HEADERS= \ - MED_Factory.hxx \ - MED_WrapperFactory.hxx - -dist_libMEDWrapper_la_SOURCES= \ - MED_Factory.cxx - -libMEDWrapper_la_CPPFLAGS= $(BOOST_CPPFLAGS) $(MED3_INCLUDES) \ - -I$(srcdir)/../Base -libMEDWrapper_la_CPPFLAGS+= -I$(KERNEL_ROOT_DIR)/include/salome -libMEDWrapper_la_CPPFLAGS+= -I$(srcdir)/../V2_2 -libMEDWrapper_la_LDFLAGS= ../V2_2/libMEDWrapper_V2_2.la - -# Executables targets -bin_PROGRAMS = MED_Test mprint_version - -dist_MED_Test_SOURCES= MED_Test.cxx -MED_Test_CPPFLAGS= $(libMEDWrapper_la_CPPFLAGS) -MED_Test_LDADD= $(libMEDWrapper_la_LDFLAGS) ../Base/libMEDWrapperBase.la \ - $(BOOST_LIB_THREAD) $(BOOST_LIB_SYSTEM) libMEDWrapper.la - -dist_mprint_version_SOURCES= mprint_version.cxx -mprint_version_CPPFLAGS= $(libMEDWrapper_la_CPPFLAGS) -mprint_version_LDADD= $(libMEDWrapper_la_LDFLAGS) ../Base/libMEDWrapperBase.la \ - $(BOOST_LIB_THREAD) $(BOOST_LIB_SYSTEM) libMEDWrapper.la $(MED3_LIBS_C_ONLY) diff --git a/src/MEDWrapper/Makefile.am b/src/MEDWrapper/Makefile.am deleted file mode 100644 index 8ebdfd64a..000000000 --- a/src/MEDWrapper/Makefile.am +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = Base V2_2 Factory - -DIST_SUBDIRS = Base V2_2 Factory diff --git a/src/MEDWrapper/V2_2/CMakeLists.txt b/src/MEDWrapper/V2_2/CMakeLists.txt index 7bbe89e65..43118dcff 100644 --- a/src/MEDWrapper/V2_2/CMakeLists.txt +++ b/src/MEDWrapper/V2_2/CMakeLists.txt @@ -17,27 +17,47 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +# --- options --- +# additional include directories INCLUDE_DIRECTORIES( - ${MED3_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} - ${BOOST_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../Base - ) +) +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${HDF5_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +SET(_link_LIBRARIES + ${HDF5_LIBS} + ${MEDFILE_C_LIBRARIES} + ${Boost_LIBRARIES} + MEDWrapperBase +) + +# --- headers --- + +# header files / no moc processing +SET(MEDWrapper_V2_2_HEADERS + MED_V2_2_Wrapper.hxx +) + +# --- sources --- + +# sources / static SET(MEDWrapper_V2_2_SOURCES MED_V2_2_Wrapper.cxx - ) +) -IF(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) -ELSE(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel) -ENDIF(MED_ENABLE_KERNEL) +# --- rules --- -ADD_LIBRARY(MEDWrapper_V2_2 SHARED ${MEDWrapper_V2_2_SOURCES}) -SET_TARGET_PROPERTIES(MEDWrapper_V2_2 PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -TARGET_LINK_LIBRARIES(MEDWrapper_V2_2 MEDWrapperBase ${MED3_LIBS_C_ONLY} ${HDF5_LIBS}) -INSTALL(TARGETS MEDWrapper_V2_2 DESTINATION ${MED_salomelib_LIBS}) +ADD_LIBRARY(MEDWrapper_V2_2 ${MEDWrapper_V2_2_SOURCES}) +TARGET_LINK_LIBRARIES(MEDWrapper_V2_2 ${_link_LIBRARIES}) +INSTALL(TARGETS MEDWrapper_V2_2 EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) -FILE(GLOB MEDWrapper_V2_2_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") -INSTALL(FILES ${MEDWrapper_V2_2_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) +INSTALL(FILES ${MEDWrapper_V2_2_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEDWrapper/V2_2/Makefile.am b/src/MEDWrapper/V2_2/Makefile.am deleted file mode 100644 index d744452a7..000000000 --- a/src/MEDWrapper/V2_2/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -lib_LTLIBRARIES= libMEDWrapper_V2_2.la - -salomeinclude_HEADERS = \ - MED_V2_2_Wrapper.hxx - -dist_libMEDWrapper_V2_2_la_SOURCES = \ - MED_V2_2_Wrapper.cxx - -libMEDWrapper_V2_2_la_CPPFLAGS= $(BOOST_CPPFLAGS) $(MED3_INCLUDES) $(HDF5_INCLUDES) -I$(srcdir)/../Base -libMEDWrapper_V2_2_la_CPPFLAGS+= -I$(KERNEL_ROOT_DIR)/include/salome -libMEDWrapper_V2_2_la_LDFLAGS= $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) -libMEDWrapper_V2_2_la_LIBADD= ../Base/libMEDWrapperBase.la diff --git a/src/MEFISTO2/CMakeLists.txt b/src/MEFISTO2/CMakeLists.txt new file mode 100644 index 000000000..752189136 --- /dev/null +++ b/src/MEFISTO2/CMakeLists.txt @@ -0,0 +1,63 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} + ${PLATFORM_INCLUDES} +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKernel} + ${CAS_TKMath} + ${KERNEL_SALOMELocalTrace} +) + +# --- headers --- + +# header files / no moc processing +SET(MEFISTO2D_HEADERS + aptrte.h + Rn.h +) + +# --- sources --- + +# sources / static +SET(MEFISTO2D_SOURCES + aptrte.cxx + trte.f +) + +# --- rules --- + +ADD_LIBRARY(MEFISTO2D ${MEFISTO2D_SOURCES}) +TARGET_LINK_LIBRARIES(MEFISTO2D ${_link_LIBRARIES} ) +INSTALL(TARGETS MEFISTO2D EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${MEFISTO2D_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEFISTO2/Makefile.am b/src/MEFISTO2/Makefile.am deleted file mode 100644 index f3ec841e1..000000000 --- a/src/MEFISTO2/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - aptrte.h Rn.h - -# Libraries targets -lib_LTLIBRARIES = libMEFISTO2D.la -dist_libMEFISTO2D_la_SOURCES = \ - aptrte.cxx \ - trte.f - -# additionnal information to compil and link file -libMEFISTO2D_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - @PLATFORM_INCLUDES@ - -libMEFISTO2D_la_LDFLAGS = \ - $(CAS_LDFLAGS) -lTKernel -lTKMath \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(FCLIBS) - -#if USE_GFORTRAN -#libMEFISTO2D_la_LDFLAGS += -lgfortran -#else !USE_GFORTRAN -#libMEFISTO2D_la_LDFLAGS += -lg2c -#endif - -OBSOLETE_FILES = areteideale.f - -EXTRA_DIST += $(OBSOLETE_FILES) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 246391150..000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -if WITH_CGNS - DriverCGNS_SUDIR = DriverCGNS -endif - -SUBDIRS = \ - SMDS \ - SMESHDS \ - SMESHUtils \ - Controls \ - Driver \ - MEDWrapper \ - DriverMED \ - DriverDAT \ - DriverUNV \ - DriverSTL \ - DriverGMF \ - $(DriverCGNS_SUDIR) \ - SMESH \ - SMESH_I \ - SMESHClient \ - SMESH_SWIG \ - MEFISTO2 \ - StdMeshers \ - StdMeshers_I \ - SMESH_PY \ - Tools - -if SMESH_ENABLE_GUI - SUBDIRS += \ - OBJECT \ - SMESHFiltersSelection \ - SMESHGUI \ - PluginUtils \ - SMESH_SWIG_WITHIHM \ - StdMeshersGUI -endif - -DIST_SUBDIRS = SMDS SMESHDS Controls Driver MEDWrapper DriverMED DriverDAT DriverUNV DriverSTL DriverCGNS \ - DriverGMF \ - SMESHUtils SMESH SMESH_I SMESHClient SMESH_SWIG MEFISTO2 StdMeshers StdMeshers_I OBJECT \ - SMESHFiltersSelection SMESHGUI PluginUtils SMESH_SWIG_WITHIHM StdMeshersGUI SMESH_PY Tools diff --git a/src/OBJECT/CMakeLists.txt b/src/OBJECT/CMakeLists.txt new file mode 100644 index 000000000..64350a8fd --- /dev/null +++ b/src/OBJECT/CMakeLists.txt @@ -0,0 +1,113 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${QWT_INCLUDE_DIR} + ${GEOM_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/Controls + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/DriverMED + ${PROJECT_SOURCE_DIR}/src/SMESH + ${PROJECT_SOURCE_DIR}/src/SMESHClient + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} + ${OMNIORB_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${QT_LIBRARIES} + ${VTK_LIBRARIES} + ${CAS_KERNEL} + ${GEOM_GEOMObject} + ${GUI_SalomeApp} + ${GUI_SalomeObject} + ${GUI_SVTK} + ${GUI_VTKViewer} + ${GUI_qtx} + ${GUI_suit} + ${GUI_std} + ${GUI_Plot2d} + ${GUI_SPlot2d} + SMESHClient + SMDS + SMESHControls +) + +# --- headers --- + +# header files / no moc processing +SET(SMESHObject_HEADERS + SMESH_Actor.h + SMESH_Object.h + SMESH_ObjectDef.h + SMESH_ActorUtils.h + SMESH_ActorDef.h + SMESH_DeviceActor.h + SMESH_PreviewActorsCollection.h + SMESH_ExtractGeometry.h + SMESH_FaceOrientationFilter.h + SMESH_ScalarBarActor.h + SMESH_NodeLabelActor.h + SMESH_CellLabelActor.h + SMESH_SVTKActor.h +) + +# --- sources --- + +# sources / static +SET(SMESHObject_SOURCES + SMESH_Object.cxx + SMESH_DeviceActor.cxx + SMESH_Actor.cxx + SMESH_PreviewActorsCollection.cxx + SMESH_ExtractGeometry.cxx + SMESH_ActorUtils.cxx + SMESH_FaceOrientationFilter.cxx + SMESH_ScalarBarActor.cxx + SMESH_NodeLabelActor.cxx + SMESH_CellLabelActor.cxx + SMESH_SVTKActor.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMESHObject ${SMESHObject_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHObject ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESHObject EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SMESHObject_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am deleted file mode 100644 index b8526a6fe..000000000 --- a/src/OBJECT/Makefile.am +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH OBJECT : interactive object for SMESH visualization -# File : Makefile.in -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESH_Actor.h \ - SMESH_Object.h \ - SMESH_ObjectDef.h \ - SMESH_ActorUtils.h \ - SMESH_ActorDef.h \ - SMESH_DeviceActor.h \ - SMESH_PreviewActorsCollection.h \ - SMESH_ExtractGeometry.h \ - SMESH_FaceOrientationFilter.h \ - SMESH_ScalarBarActor.h \ - SMESH_NodeLabelActor.h \ - SMESH_CellLabelActor.h \ - SMESH_SVTKActor.h - - -# Libraries targets - -lib_LTLIBRARIES = libSMESHObject.la -dist_libSMESHObject_la_SOURCES = \ - SMESH_Object.cxx \ - SMESH_DeviceActor.cxx \ - SMESH_Actor.cxx \ - SMESH_PreviewActorsCollection.cxx \ - SMESH_ExtractGeometry.cxx \ - SMESH_ActorUtils.cxx \ - SMESH_FaceOrientationFilter.cxx \ - SMESH_ScalarBarActor.cxx \ - SMESH_NodeLabelActor.cxx \ - SMESH_CellLabelActor.cxx \ - SMESH_SVTKActor.cxx - -libSMESHObject_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(QWT_INCLUDES) \ - $(GEOM_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(CORBA_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(QT_INCLUDES) \ - -I$(srcdir)/../Controls \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../DriverMED \ - -I$(srcdir)/../SMESH \ - -I$(srcdir)/../SMESHClient \ - -I$(srcdir)/../SMESHUtils \ - -I$(top_builddir)/idl - -libSMESHObject_la_LDFLAGS = \ - ../SMESHClient/libSMESHClient.la \ - ../SMDS/libSMDS.la \ - ../Controls/libSMESHControls.la \ - $(GUI_LDFLAGS) -lSalomeApp -lSalomeObject -lSVTK -lVTKViewer -lqtx -lsuit -lstd \ - -lPlot2d \ - -lSPlot2d \ - $(GEOM_LDFLAGS) -lGEOMObject -lOCC2VTK -lSalomeIDLGEOM \ - $(CAS_KERNEL) \ - $(VTK_LIBS) $(QT_MT_LIBS) diff --git a/src/PluginUtils/CMakeLists.txt b/src/PluginUtils/CMakeLists.txt new file mode 100644 index 000000000..b3a88e7ad --- /dev/null +++ b/src/PluginUtils/CMakeLists.txt @@ -0,0 +1,78 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${CAS_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/src/SMESHGUI + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} + ${OMNIORB_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeIDLKernel} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeLifeCycleCORBA} + ${CAS_TKBRep} + ${CAS_TKV3d} + ${GUI_SalomeObject} + ${GUI_suit} + ${GUI_LightApp} + ${GUI_SalomeApp} + SalomeIDLSMESH + SMESH +) + +# --- headers --- + +# header files / to be processed by moc +SET(GeomSelectionTools_HEADERS + GeomSelectionTools.h +) + +# --- sources --- + +# sources / static +SET(GeomSelectionTools_SOURCES + GeomSelectionTools.cxx +) + +# --- rules --- + +ADD_LIBRARY(GeomSelectionTools ${GeomSelectionTools_SOURCES}) +TARGET_LINK_LIBRARIES(GeomSelectionTools ${_link_LIBRARIES} ) +INSTALL(TARGETS GeomSelectionTools EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${GeomSelectionTools_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/PluginUtils/Makefile.am b/src/PluginUtils/Makefile.am deleted file mode 100644 index 4874c4839..000000000 --- a/src/PluginUtils/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# --- -# File : Makefile.am -# Author : Nicolas GEIMER (OCC) -# --- - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - GeomSelectionTools.h - -# Libraries targets -lib_LTLIBRARIES = libGeomSelectionTools.la - -dist_libGeomSelectionTools_la_SOURCES = \ - GeomSelectionTools.h \ - GeomSelectionTools.cxx - -# additionnal information to compil and link file -libGeomSelectionTools_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../SMESHGUI \ - -I$(top_builddir)/idl - -libGeomSelectionTools_la_LDFLAGS = \ - ../../idl/libSalomeIDLSMESH.la \ - ../SMESHGUI/libSMESH.la \ - $(QT_LIBS) \ - $(CORBA_LIBS) \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lSALOMELocalTrace -lSalomeLifeCycleCORBA \ - $(GUI_LDFLAGS) -lSalomeObject -lsuit -lLightApp -lSalomeApp \ - $(GEOM_LDFLAGS) -lSalomeIDLGEOM -lGEOMClient \ - $(CAS_KERNEL) -lTKBRep -lTKG3d diff --git a/src/SMDS/CMakeLists.txt b/src/SMDS/CMakeLists.txt new file mode 100644 index 000000000..275c07896 --- /dev/null +++ b/src/SMDS/CMakeLists.txt @@ -0,0 +1,153 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${VTK_LIBRARIES} + ${KERNEL_SALOMELocalTrace} + ${KERNEL_OpUtil} +) + +# --- headers --- + +# header files / no moc processing +SET(SMDS_HEADERS + chrono.hxx + ObjectPool.hxx + SMDS_TypeOfPosition.hxx + SMDSAbs_ElementType.hxx + SMDS_EdgePosition.hxx + SMDS_ElemIterator.hxx + SMDS_FacePosition.hxx + SMDS_Mesh.hxx + SMDS_Mesh0DElement.hxx + SMDS_LinearEdge.hxx + SMDS_MeshEdge.hxx + SMDS_MeshElement.hxx + SMDS_MeshElementIDFactory.hxx + SMDS_MeshCell.hxx + SMDS_MeshFace.hxx + SMDS_MeshGroup.hxx + SMDS_MeshIDFactory.hxx + SMDS_MeshNode.hxx + SMDS_MeshNodeIDFactory.hxx + SMDS_MeshObject.hxx + SMDS_MeshVolume.hxx + SMDS_Position.hxx + SMDS_SpacePosition.hxx + SMDS_VertexPosition.hxx + SMDS_Iterator.hxx + SMDS_IteratorOfElements.hxx + SMDS_VolumeOfFaces.hxx + SMDS_VolumeOfNodes.hxx + SMDS_VtkEdge.hxx + SMDS_VtkFace.hxx + SMDS_VtkVolume.hxx + SMDS_VtkCellIterator.hxx + SMDS_PolyhedralVolumeOfNodes.hxx + SMDS_FaceOfEdges.hxx + SMDS_FaceOfNodes.hxx + SMDS_PolygonalFaceOfNodes.hxx + SMDS_VolumeTool.hxx + SMDS_QuadraticEdge.hxx + SMDS_QuadraticFaceOfNodes.hxx + SMDS_QuadraticVolumeOfNodes.hxx + SMDS_SetIterator.hxx + SMESH_SMDS.hxx + SMDS_MeshInfo.hxx + SMDS_UnstructuredGrid.hxx + SMDS_Downward.hxx + SMDS_StdIterator.hxx + SMDS_IteratorOnIterators.hxx + SMDS_BallElement.hxx +) + +# --- sources --- + +# sources / static +SET(SMDS_SOURCES + chrono.cxx + SMDS_MeshObject.cxx + SMDS_MeshElement.cxx + SMDS_MeshCell.cxx + SMDS_Position.cxx + SMDS_EdgePosition.cxx + SMDS_FacePosition.cxx + SMDS_SpacePosition.cxx + SMDS_VertexPosition.cxx + SMDS_MeshNode.cxx + SMDS_Mesh0DElement.cxx + SMDS_LinearEdge.cxx + SMDS_MeshEdge.cxx + SMDS_MeshFace.cxx + SMDS_MeshVolume.cxx + SMDS_MeshNodeIDFactory.cxx + SMDS_MeshElementIDFactory.cxx + SMDS_MeshGroup.cxx + SMDS_MeshIDFactory.cxx + SMDS_Mesh.cxx + SMDS_IteratorOfElements.cxx + SMDS_VolumeOfFaces.cxx + SMDS_VolumeOfNodes.cxx + SMDS_VtkEdge.cxx + SMDS_VtkFace.cxx + SMDS_VtkVolume.cxx + SMDS_VtkCellIterator.cxx + SMDS_PolyhedralVolumeOfNodes.cxx + SMDS_FaceOfEdges.cxx + SMDS_FaceOfNodes.cxx + SMDS_PolygonalFaceOfNodes.cxx + SMDS_VolumeTool.cxx + SMDS_QuadraticEdge.cxx + SMDS_QuadraticFaceOfNodes.cxx + SMDS_QuadraticVolumeOfNodes.cxx + SMDS_UnstructuredGrid.cxx + SMDS_Downward.cxx + SMDS_BallElement.cxx +) + +# bin programs +SET(SMDS_MemoryLimit_SOURCES + SMDS_MemoryLimit.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMDS ${SMDS_SOURCES}) +TARGET_LINK_LIBRARIES(SMDS ${_link_LIBRARIES} ) +INSTALL(TARGETS SMDS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(SMDS_MemoryLimit ${SMDS_MemoryLimit_SOURCES}) +TARGET_LINK_LIBRARIES(SMDS_MemoryLimit ${_link_LIBRARIES}) +INSTALL(TARGETS SMDS_MemoryLimit EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${SMDS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SMDS/Makefile.am b/src/SMDS/Makefile.am deleted file mode 100644 index 69bd1ecf4..000000000 --- a/src/SMDS/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH SMDS : implementaion of Salome mesh data structure -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - chrono.hxx \ - ObjectPool.hxx \ - SMDS_TypeOfPosition.hxx \ - SMDSAbs_ElementType.hxx \ - SMDS_EdgePosition.hxx \ - SMDS_ElemIterator.hxx \ - SMDS_FacePosition.hxx \ - SMDS_Mesh.hxx \ - SMDS_Mesh0DElement.hxx \ - SMDS_LinearEdge.hxx \ - SMDS_MeshEdge.hxx \ - SMDS_MeshElement.hxx \ - SMDS_MeshElement.cxx \ - SMDS_MeshElementIDFactory.hxx \ - SMDS_MeshCell.hxx \ - SMDS_MeshFace.hxx \ - SMDS_MeshGroup.hxx \ - SMDS_MeshIDFactory.hxx \ - SMDS_MeshNode.hxx \ - SMDS_MeshNodeIDFactory.hxx \ - SMDS_MeshObject.hxx \ - SMDS_MeshVolume.hxx \ - SMDS_Position.hxx \ - SMDS_SpacePosition.hxx \ - SMDS_VertexPosition.hxx \ - SMDS_Iterator.hxx \ - SMDS_IteratorOfElements.hxx \ - SMDS_VolumeOfFaces.hxx \ - SMDS_VolumeOfNodes.hxx \ - SMDS_VtkEdge.hxx \ - SMDS_VtkFace.hxx \ - SMDS_VtkVolume.hxx \ - SMDS_VtkCellIterator.hxx \ - SMDS_PolyhedralVolumeOfNodes.hxx \ - SMDS_FaceOfEdges.hxx \ - SMDS_FaceOfNodes.hxx \ - SMDS_PolygonalFaceOfNodes.hxx \ - SMDS_VolumeTool.hxx \ - SMDS_QuadraticEdge.hxx \ - SMDS_QuadraticFaceOfNodes.hxx \ - SMDS_QuadraticVolumeOfNodes.hxx \ - SMDS_SetIterator.hxx \ - SMESH_SMDS.hxx \ - SMDS_MeshInfo.hxx \ - SMDS_UnstructuredGrid.hxx \ - SMDS_Downward.hxx \ - SMDS_StdIterator.hxx \ - SMDS_IteratorOnIterators.hxx \ - SMDS_BallElement.hxx - - -# Libraries targets - -lib_LTLIBRARIES = libSMDS.la -dist_libSMDS_la_SOURCES = \ - chrono.cxx \ - SMDS_MeshObject.cxx \ - SMDS_MeshElement.cxx \ - SMDS_MeshCell.cxx \ - SMDS_Position.cxx \ - SMDS_EdgePosition.cxx \ - SMDS_FacePosition.cxx \ - SMDS_SpacePosition.cxx \ - SMDS_VertexPosition.cxx \ - SMDS_MeshNode.cxx \ - SMDS_Mesh0DElement.cxx \ - SMDS_LinearEdge.cxx \ - SMDS_MeshEdge.cxx \ - SMDS_MeshFace.cxx \ - SMDS_MeshVolume.cxx \ - SMDS_MeshNodeIDFactory.cxx \ - SMDS_MeshElementIDFactory.cxx \ - SMDS_MeshGroup.cxx \ - SMDS_MeshIDFactory.cxx \ - SMDS_Mesh.cxx \ - SMDS_IteratorOfElements.cxx \ - SMDS_VolumeOfFaces.cxx \ - SMDS_VolumeOfNodes.cxx \ - SMDS_VtkEdge.cxx \ - SMDS_VtkFace.cxx \ - SMDS_VtkVolume.cxx \ - SMDS_VtkCellIterator.cxx \ - SMDS_PolyhedralVolumeOfNodes.cxx \ - SMDS_FaceOfEdges.cxx \ - SMDS_FaceOfNodes.cxx \ - SMDS_PolygonalFaceOfNodes.cxx \ - SMDS_VolumeTool.cxx \ - SMDS_QuadraticEdge.cxx \ - SMDS_QuadraticFaceOfNodes.cxx \ - SMDS_QuadraticVolumeOfNodes.cxx \ - SMDS_UnstructuredGrid.cxx \ - SMDS_Downward.cxx \ - SMDS_BallElement.cxx - -# additionnal information to compil and link file -libSMDS_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) - -libSMDS_la_LDFLAGS = \ - $(VTK_LIBS) \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil - -# Executables targets -bin_PROGRAMS = SMDS_MemoryLimit -dist_SMDS_MemoryLimit_SOURCES = \ - SMDS_MemoryLimit.cxx diff --git a/src/SMESH/CMakeLists.txt b/src/SMESH/CMakeLists.txt new file mode 100644 index 000000000..2cbbe7267 --- /dev/null +++ b/src/SMESH/CMakeLists.txt @@ -0,0 +1,115 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/Controls + ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/DriverDAT + ${PROJECT_SOURCE_DIR}/src/DriverMED + ${PROJECT_SOURCE_DIR}/src/DriverUNV + ${PROJECT_SOURCE_DIR}/src/DriverSTL + ${PROJECT_SOURCE_DIR}/src/DriverCGNS + ${PROJECT_SOURCE_DIR}/src/DriverGMF + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# optional sources +IF(SALOME_SMESH_USE_CGNS) + SET(DriverCGNS_LIB MeshDriverCGNS) +ENDIF(SALOME_SMESH_USE_CGNS) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKShHealing} + ${CAS_TKPrim} + ${CAS_TKG2d} + ${CAS_TKCDF} + ${GEOM_NMTTools} + ${Boost_LIBRARIES} + SMESHDS + SMESHControls + MeshDriverDAT + MeshDriverSTL + MeshDriverMED + MeshDriverUNV + MeshDriverGMF + ${DriverCGNS_LIB} +) + +# --- headers --- + +# header files / no moc processing +SET(SMESHimpl_HEADERS + SMESH_Gen.hxx + SMESH_Mesh.hxx + SMESH_subMesh.hxx + SMESH_subMeshEventListener.hxx + SMESH_Hypothesis.hxx + SMESH_HypoFilter.hxx + SMESH_Algo.hxx + SMESH_Group.hxx + SMESH_MeshEditor.hxx + SMESH_Pattern.hxx + SMESH_MesherHelper.hxx + SMESH_ProxyMesh.hxx + SMESH_SMESH.hxx +) + +# --- sources --- + +# sources / static +SET(SMESHimpl_SOURCES + memoire.h + SMESH_Gen.cxx + SMESH_Mesh.cxx + SMESH_subMesh.cxx + SMESH_Hypothesis.cxx + SMESH_Algo.cxx + SMESH_Group.cxx + SMESH_MeshEditor.cxx + SMESH_Pattern.cxx + SMESH_HypoFilter.cxx + SMESH_ProxyMesh.cxx + SMESH_MesherHelper.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMESHimpl ${SMESHimpl_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHimpl ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESHimpl EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SMESHimpl_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am deleted file mode 100644 index 180e03909..000000000 --- a/src/SMESH/Makefile.am +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH SMESH : implementaion of SMESH idl descriptions -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESH_Gen.hxx \ - SMESH_Mesh.hxx \ - SMESH_subMesh.hxx \ - SMESH_subMeshEventListener.hxx \ - SMESH_Hypothesis.hxx \ - SMESH_HypoFilter.hxx \ - SMESH_Algo.hxx \ - SMESH_Group.hxx \ - SMESH_MeshEditor.hxx \ - SMESH_Pattern.hxx \ - SMESH_MesherHelper.hxx \ - SMESH_ProxyMesh.hxx \ - SMESH_SMESH.hxx - -# Libraries targets - -lib_LTLIBRARIES = libSMESHimpl.la - -dist_libSMESHimpl_la_SOURCES = \ - memoire.h \ - SMESH_Gen.cxx \ - SMESH_Mesh.cxx \ - SMESH_subMesh.cxx \ - SMESH_Hypothesis.cxx \ - SMESH_Algo.cxx \ - SMESH_Group.cxx \ - SMESH_MeshEditor.cxx \ - SMESH_Pattern.cxx \ - SMESH_HypoFilter.cxx \ - SMESH_ProxyMesh.cxx \ - SMESH_MesherHelper.cxx - -# additionnal information to compile and link file -libSMESHimpl_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(GEOM_CXX_FLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - @HDF5_INCLUDES@ \ - -I$(srcdir)/../Controls \ - -I$(srcdir)/../MEDWrapper/Base \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../DriverDAT \ - -I$(srcdir)/../DriverMED \ - -I$(srcdir)/../DriverUNV \ - -I$(srcdir)/../DriverSTL \ - -I$(srcdir)/../DriverCGNS \ - -I$(srcdir)/../DriverGMF \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../SMESHUtils - -if WITH_CGNS - DriverCGNS_LIB = ../DriverCGNS/libMeshDriverCGNS.la -endif - -libSMESHimpl_la_LDFLAGS = \ - ../SMESHDS/libSMESHDS.la \ - ../Controls/libSMESHControls.la \ - ../DriverDAT/libMeshDriverDAT.la \ - ../DriverSTL/libMeshDriverSTL.la \ - ../DriverMED/libMeshDriverMED.la \ - ../DriverUNV/libMeshDriverUNV.la \ - ../DriverGMF/libMeshDriverGMF.la \ - $(DriverCGNS_LIB) \ - ../SMESHUtils/libSMESHUtils.la \ - $(BOOST_LIB_THREAD) \ - $(BOOST_LIB_SYSTEM) \ - $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKCDF diff --git a/src/SMESHClient/CMakeLists.txt b/src/SMESHClient/CMakeLists.txt new file mode 100644 index 000000000..7a7b4e92e --- /dev/null +++ b/src/SMESHClient/CMakeLists.txt @@ -0,0 +1,107 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/src/Controls + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/DriverDAT + ${PROJECT_SOURCE_DIR}/src/DriverMED + ${PROJECT_SOURCE_DIR}/src/DriverUNV + ${PROJECT_SOURCE_DIR}/src/DriverSTL + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/SMESH + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_SalomeNS} + ${KERNEL_OpUtil} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeGenericObj} + ${KERNEL_Registry} + ${KERNEL_ResourcesManager} + ${KERNEL_SalomeResourcesManager} + ${KERNEL_SalomeNotification} + ${KERNEL_SalomeIDLKERNEL} + ${KERNEL_SALOMELocalTrace} + ${GEOM_NMTDS} + ${GEOM_SalomeIDLGEOM} + ${CAS_KERNEL} + SalomeIDLSMESH + SMDS + SMESHimpl + SMESHDS + SMESHControls + MEDWrapper + MEDWrapperBase + MEDWrapper_V2_2 +) + +# --- headers --- + +# header files / no moc processing +SET(SMESHClient_HEADERS + SMESH_Client.hxx +) + +# --- sources --- + +# sources / static +SET(SMESHClient_SOURCES + SMESH_Client.cxx +) + +# bin programs +SET(SMESHClientBin_SOURCES + SMESHClientBin.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMESHClient ${SMESHClient_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHClient ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESHClient EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(SMESHClientBin ${SMESHClientBin_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHClientBin ${_link_LIBRARIES}) +INSTALL(TARGETS SMESHClientBin EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${SMESHClient_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am deleted file mode 100644 index 5a9809346..000000000 --- a/src/SMESHClient/Makefile.am +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com - -# GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client -# File : Makefile.in -# Author : Pavel TELKOV (OCC) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SHESM - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESH_Client.hxx - -# Libraries targets -lib_LTLIBRARIES = libSMESHClient.la -dist_libSMESHClient_la_SOURCES = \ - SMESH_Client.cxx - -# Executables targets -bin_PROGRAMS = SMESHClientBin -dist_SMESHClientBin_SOURCES = \ - SMESHClientBin.cxx - -# additionnal information to compil and link file -libSMESHClient_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../Controls \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../DriverDAT \ - -I$(srcdir)/../DriverMED \ - -I$(srcdir)/../DriverUNV \ - -I$(srcdir)/../DriverSTL \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../SMESH \ - -I$(srcdir)/../SMESHUtils \ - -I$(top_builddir)/idl - -libSMESHClient_la_LDFLAGS = \ - ../../idl/libSalomeIDLSMESH.la \ - ../SMDS/libSMDS.la \ - ../SMESH/libSMESHimpl.la \ - ../SMESHDS/libSMESHDS.la \ - ../Controls/libSMESHControls.la \ - ../MEDWrapper/Factory/libMEDWrapper.la \ - ../MEDWrapper/Base/libMEDWrapperBase.la \ - ../MEDWrapper/V2_2/libMEDWrapper_V2_2.la \ - $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics -lSalomeContainer -lSalomeHDFPersist -lSalomeGenericObj \ - -lRegistry -lResourcesManager -lSalomeResourcesManager -lSalomeNotification \ - -lSalomeIDLKernel -lSALOMELocalTrace \ - $(GEOM_LDFLAGS) -lSalomeIDLGEOM \ - $(CAS_KERNEL) - - -SMESHClientBin_CPPFLAGS = \ - $(libSMESHClient_la_CPPFLAGS) - -SMESHClientBin_LDADD = \ - $(libSMESHClient_la_LDFLAGS) @CORBA_LIBS@ - - diff --git a/src/SMESHDS/CMakeLists.txt b/src/SMESHDS/CMakeLists.txt new file mode 100644 index 000000000..4359252ff --- /dev/null +++ b/src/SMESHDS/CMakeLists.txt @@ -0,0 +1,87 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/SMDS + +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_KERNEL} + ${CAS_TKBRep} + ${KERNEL_SALOMELocalTrace} + SMDS +) + +# --- headers --- + +# header files / no moc processing +SET(SMESHDS_HEADERS + SMESHDS_Document.hxx + SMESHDS_Hypothesis.hxx + SMESHDS_Mesh.hxx + SMESHDS_Script.hxx + SMESHDS_Command.hxx + SMESHDS_CommandType.hxx + SMESHDS_SubMesh.hxx + SMESHDS_GroupBase.hxx + SMESHDS_Group.hxx + SMESHDS_GroupOnGeom.hxx + SMESHDS_GroupOnFilter.hxx + SMESH_SMESHDS.hxx + SMESHDS_DataMapOfShape.hxx + SMESH_Controls.hxx +) + +# --- sources --- + +# sources / static +SET(SMESHDS_SOURCES + SMESHDS_Document.cxx + SMESHDS_Hypothesis.cxx + SMESHDS_Script.cxx + SMESHDS_Command.cxx + SMESHDS_SubMesh.cxx + SMESHDS_Mesh.cxx + SMESHDS_GroupBase.cxx + SMESHDS_Group.cxx + SMESHDS_GroupOnGeom.cxx + SMESHDS_GroupOnFilter.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMESHDS ${SMESHDS_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHDS ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESHDS EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SMESHDS_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SMESHDS/Makefile.am b/src/SMESHDS/Makefile.am deleted file mode 100644 index b7ae6427e..000000000 --- a/src/SMESHDS/Makefile.am +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH SMESHDS : management of mesh data and SMESH document -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESHDS_Document.hxx \ - SMESHDS_Hypothesis.hxx \ - SMESHDS_Mesh.hxx \ - SMESHDS_Script.hxx \ - SMESHDS_Command.hxx \ - SMESHDS_CommandType.hxx \ - SMESHDS_SubMesh.hxx \ - SMESHDS_GroupBase.hxx \ - SMESHDS_Group.hxx \ - SMESHDS_GroupOnGeom.hxx \ - SMESHDS_GroupOnFilter.hxx \ - SMESH_SMESHDS.hxx \ - SMESHDS_DataMapOfShape.hxx \ - SMESH_Controls.hxx - -# Libraries targets -lib_LTLIBRARIES = libSMESHDS.la - -dist_libSMESHDS_la_SOURCES = \ - SMESHDS_Document.cxx \ - SMESHDS_Hypothesis.cxx \ - SMESHDS_Script.cxx \ - SMESHDS_Command.cxx \ - SMESHDS_SubMesh.cxx \ - SMESHDS_Mesh.cxx \ - SMESHDS_GroupBase.cxx \ - SMESHDS_Group.cxx \ - SMESHDS_GroupOnGeom.cxx \ - SMESHDS_GroupOnFilter.cxx - -# additionnal information to compil and link file -libSMESHDS_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../SMDS - -libSMESHDS_la_LDFLAGS = \ - ../SMDS/libSMDS.la \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(CAS_KERNEL) -lTKBRep diff --git a/src/SMESHFiltersSelection/CMakeLists.txt b/src/SMESHFiltersSelection/CMakeLists.txt new file mode 100644 index 000000000..7a9b9566b --- /dev/null +++ b/src/SMESHFiltersSelection/CMakeLists.txt @@ -0,0 +1,83 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${QT_INCLUDES} + ${PYTHON_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} + ${CAS_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeDSClient} + ${KERNEL_SalomeDS} + ${GUI_SalomeApp} + ${GUI_suit} + ${GUI_LightApp} + ${GEOM_GEOM} + ${GEOM_GEOMClient} + ${CAS_TKernel} + ${CAS_TKMath} + ${CAS_TKBRep} + SalomeIDLSMESH +) + +# --- headers --- + +# header files / no moc processing +SET(SMESHFiltersSelection_HEADERS + SMESH_Type.h + SMESH_TypeFilter.hxx + SMESH_NumberFilter.hxx + SMESH_LogicalFilter.hxx +) + +# --- sources --- + +# sources / static +SET(SMESHFiltersSelection_SOURCES + SMESH_TypeFilter.cxx + SMESH_NumberFilter.cxx + SMESH_LogicalFilter.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMESHFiltersSelection ${SMESHFiltersSelection_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHFiltersSelection ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESHFiltersSelection EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SMESHFiltersSelection_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SMESHFiltersSelection/Makefile.am b/src/SMESHFiltersSelection/Makefile.am deleted file mode 100644 index bad3fccdc..000000000 --- a/src/SMESHFiltersSelection/Makefile.am +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH SMESHFiltersSelection : filter selector for viewer -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# $Header$ -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESH_Type.h \ - SMESH_TypeFilter.hxx \ - SMESH_NumberFilter.hxx \ - SMESH_LogicalFilter.hxx - -# Libraries targets - -lib_LTLIBRARIES = libSMESHFiltersSelection.la - -dist_libSMESHFiltersSelection_la_SOURCES = \ - SMESH_TypeFilter.cxx \ - SMESH_NumberFilter.cxx \ - SMESH_LogicalFilter.cxx - -# additionnal information to compil and link file -libSMESHFiltersSelection_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(QT_INCLUDES) \ - $(PYTHON_INCLUDES) \ - $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(top_builddir)/idl - -libSMESHFiltersSelection_la_LDFLAGS = \ - ../../idl/libSalomeIDLSMESH.la \ - $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \ - $(GUI_LDFLAGS) -lSalomeApp -lsuit -lLightApp \ - $(GEOM_LDFLAGS) -lGEOMClient -lSalomeIDLGEOM \ - $(CAS_LDPATH) -lTKernel -lTKMath -lTKBRep \ - $(QT_MT_LIBS) diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt new file mode 100644 index 000000000..725c34ae2 --- /dev/null +++ b/src/SMESHGUI/CMakeLists.txt @@ -0,0 +1,267 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseQt4Ext) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${VTK_INCLUDE_DIRS} + ${OGL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${QWT_INCLUDE_DIR} + ${GEOM_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${HDF5_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/SMESHFiltersSelection + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/SMESH + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESH_I + ${PROJECT_SOURCE_DIR}/src/Controls + ${PROJECT_SOURCE_DIR}/src/SMESHClient + ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} + ${OMNIORB_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKV3d} + ${GUI_SalomePrs} + ${GUI_suit} + ${GUI_SUITApp} + ${GUI_CAM} + ${GUI_std} + ${GEOM_GEOMBase} + ${GEOM_GEOMFiltersSelection} + ${GEOM_GEOMObject} + SMESHFiltersSelection + SMDS + SMESHControls + SMESHObject +) + +# --- headers --- + +# header files / to be processed by moc +SET(_moc_HEADERS + SMESHGUI.h + SMESHGUI_PatternWidget.h + SMESHGUI_MeshPatternDlg.h + SMESHGUI_CreatePatternDlg.h + SMESHGUI_NodesDlg.h + SMESHGUI_SpinBox.h + SMESHGUI_TransparencyDlg.h + SMESHGUI_ClippingDlg.h + SMESHGUI_GroupDlg.h + SMESHGUI_RemoveNodesDlg.h + SMESHGUI_RemoveElementsDlg.h + SMESHGUI_MeshInfo.h + SMESHGUI_Measurements.h + SMESHGUI_Preferences_ScalarBarDlg.h + SMESHGUI_AddMeshElementDlg.h + SMESHGUI_GroupOnShapeDlg.h + SMESHGUI_FileInfoDlg.h + SMESHGUI_FilterDlg.h + SMESHGUI_FilterLibraryDlg.h + SMESHGUI_SingleEditDlg.h + SMESHGUI_MultiEditDlg.h + SMESHGUI_DeleteGroupDlg.h + SMESHGUI_GroupOpDlg.h + SMESHGUI_SmoothingDlg.h + SMESHGUI_RenumberingDlg.h + SMESHGUI_ExtrusionDlg.h + SMESHGUI_ExtrusionAlongPathDlg.h + SMESHGUI_RevolutionDlg.h + SMESHGUI_RotationDlg.h + SMESHGUI_TranslationDlg.h + SMESHGUI_ScaleDlg.h + SMESHGUI_SymmetryDlg.h + SMESHGUI_SewingDlg.h + SMESHGUI_DuplicateNodesDlg.h + SMESHGUI_MergeDlg.h + SMESHGUI_CreatePolyhedralVolumeDlg.h + SMESHGUI_Operation.h + SMESHGUI_SelectionOp.h + SMESHGUI_Dialog.h + SMESHGUI_MeshDlg.h + SMESHGUI_MeshOp.h + SMESHGUI_Hypotheses.h + SMESHGUI_ShapeByMeshDlg.h + SMESHGUI_AddQuadraticElementDlg.h + SMESHGUI_ConvToQuadDlg.h + SMESHGUI_ConvToQuadOp.h + SMESHGUI_BuildCompoundDlg.h + SMESHGUI_ComputeDlg.h + SMESHGUI_MakeNodeAtPointDlg.h + SMESHGUI_MeshInfosBox.h + SMESHGUI_Make2DFrom3DOp.h + SMESHGUI_FindElemByPointDlg.h + SMESHGUI_MeshOrderDlg.h + SMESHGUI_CopyMeshDlg.h + SMESHGUI_MeshOrderOp.h + SMESHGUI_PreviewDlg.h + SMESHGUI_ReorientFacesDlg.h + SMESHGUI_PropertiesDlg.h + SMESHGUI_Add0DElemsOnAllNodesDlg.h +) + +# header files / no moc processing +SET(_other_HEADERS + SMESHGUI_Utils.h + SMESHGUI_HypothesesUtils.h + SMESHGUI_Selection.h + SMESHGUI_VTKUtils.h + SMESHGUI_Displayer.h + SMESHGUI_GEOMGenUtils.h + SMESHGUI_MeshUtils.h + SMESHGUI_FilterUtils.h + SMESHGUI_PatternUtils.h + SMESHGUI_GroupUtils.h + SMESHGUI_XmlHandler.h + SMESHGUI_Filter.h + SMESHGUI_MeshEditPreview.h + SMESHGUI_IdValidator.h + SMESHGUI_FileValidator.h + SMESH_SMESHGUI.hxx +) + +# header files / to install +SET(SMESH_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +# sources / static +SET(_other_SOURCES + SMESHGUI.cxx + SMESHGUI_PatternWidget.cxx + SMESHGUI_MeshPatternDlg.cxx + SMESHGUI_CreatePatternDlg.cxx + SMESHGUI_NodesDlg.cxx + SMESHGUI_SpinBox.cxx + SMESHGUI_TransparencyDlg.cxx + SMESHGUI_ClippingDlg.cxx + SMESHGUI_GroupDlg.cxx + SMESHGUI_RemoveNodesDlg.cxx + SMESHGUI_RemoveElementsDlg.cxx + SMESHGUI_MeshInfo.cxx + SMESHGUI_Measurements.cxx + SMESHGUI_Preferences_ScalarBarDlg.cxx + SMESHGUI_AddMeshElementDlg.cxx + SMESHGUI_FilterDlg.cxx + SMESHGUI_FilterLibraryDlg.cxx + SMESHGUI_SingleEditDlg.cxx + SMESHGUI_MultiEditDlg.cxx + SMESHGUI_DeleteGroupDlg.cxx + SMESHGUI_GroupOpDlg.cxx + SMESHGUI_SmoothingDlg.cxx + SMESHGUI_RenumberingDlg.cxx + SMESHGUI_ExtrusionDlg.cxx + SMESHGUI_ExtrusionAlongPathDlg.cxx + SMESHGUI_RevolutionDlg.cxx + SMESHGUI_RotationDlg.cxx + SMESHGUI_TranslationDlg.cxx + SMESHGUI_ScaleDlg.cxx + SMESHGUI_SymmetryDlg.cxx + SMESHGUI_SewingDlg.cxx + SMESHGUI_DuplicateNodesDlg.cxx + SMESHGUI_MergeDlg.cxx + SMESHGUI_CreatePolyhedralVolumeDlg.cxx + SMESHGUI_Operation.cxx + SMESHGUI_SelectionOp.cxx + SMESHGUI_Dialog.cxx + SMESHGUI_MeshDlg.cxx + SMESHGUI_MeshOp.cxx + SMESHGUI_Hypotheses.cxx + SMESHGUI_ShapeByMeshDlg.cxx + SMESHGUI_AddQuadraticElementDlg.cxx + SMESHGUI_ConvToQuadDlg.cxx + SMESHGUI_ConvToQuadOp.cxx + SMESHGUI_BuildCompoundDlg.cxx + SMESHGUI_ComputeDlg.cxx + SMESHGUI_MakeNodeAtPointDlg.cxx + SMESHGUI_GroupOnShapeDlg.cxx + SMESHGUI_FileInfoDlg.cxx + SMESHGUI_MeshInfosBox.cxx + SMESHGUI_Make2DFrom3DOp.cxx + SMESHGUI_FindElemByPointDlg.cxx + SMESHGUI_MeshOrderDlg.cxx + SMESHGUI_CopyMeshDlg.cxx + SMESHGUI_MeshOrderOp.cxx + SMESHGUI_PreviewDlg.cxx + SMESHGUI_ReorientFacesDlg.cxx + SMESHGUI_PropertiesDlg.cxx + SMESHGUI_Add0DElemsOnAllNodesDlg.cxx + SMESHGUI_Utils.cxx + SMESHGUI_HypothesesUtils.cxx + SMESHGUI_Selection.cxx + SMESHGUI_VTKUtils.cxx + SMESHGUI_Displayer.cxx + SMESHGUI_GEOMGenUtils.cxx + SMESHGUI_MeshUtils.cxx + SMESHGUI_FilterUtils.cxx + SMESHGUI_PatternUtils.cxx + SMESHGUI_GroupUtils.cxx + SMESHGUI_XmlHandler.cxx + SMESHGUI_Filter.cxx + SMESHGUI_MeshEditPreview.cxx + SMESHGUI_FileValidator.cxx +) + +# sources / to compile +SET(SMESH_SOURCES ${_other_SOURCES} ${_moc_SOURCES}) + +# --- resources --- + +# resource files / to be processed by lrelease +SET(_ts_RESOURCES + SMESH_images.ts + SMESH_msg_en.ts + SMESH_msg_fr.ts + SMESH_msg_ja.ts +) + +# --- rules --- + +ADD_LIBRARY(SMESH ${SMESH_SOURCES}) +TARGET_LINK_LIBRARIES(SMESH ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESH EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SMESH_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + +QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}") diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am deleted file mode 100644 index f756e2350..000000000 --- a/src/SMESHGUI/Makefile.am +++ /dev/null @@ -1,289 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH SMESHGUI : GUI for SMESH component -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESHGUI.h \ - SMESHGUI_Utils.h \ - SMESHGUI_Hypotheses.h \ - SMESHGUI_HypothesesUtils.h \ - SMESHGUI_SpinBox.h \ - SMESHGUI_Selection.h \ - SMESHGUI_VTKUtils.h \ - SMESHGUI_Displayer.h \ - SMESHGUI_GEOMGenUtils.h \ - SMESHGUI_MeshUtils.h \ - SMESHGUI_FilterUtils.h \ - SMESHGUI_PatternUtils.h \ - SMESHGUI_GroupUtils.h \ - SMESHGUI_PatternWidget.h \ - SMESHGUI_CreatePatternDlg.h \ - SMESHGUI_MeshPatternDlg.h \ - SMESHGUI_NodesDlg.h \ - SMESHGUI_TransparencyDlg.h \ - SMESHGUI_ClippingDlg.h \ - SMESHGUI_GroupDlg.h \ - SMESHGUI_RemoveNodesDlg.h \ - SMESHGUI_RemoveElementsDlg.h \ - SMESHGUI_MeshInfo.h \ - SMESHGUI_Measurements.h \ - SMESHGUI_Preferences_ScalarBarDlg.h \ - SMESHGUI_AddMeshElementDlg.h \ - SMESHGUI_XmlHandler.h \ - SMESHGUI_Filter.h \ - SMESHGUI_FilterDlg.h \ - SMESHGUI_FilterLibraryDlg.h \ - SMESHGUI_SingleEditDlg.h \ - SMESHGUI_MultiEditDlg.h \ - SMESHGUI_DeleteGroupDlg.h \ - SMESHGUI_GroupOpDlg.h \ - SMESHGUI_SmoothingDlg.h \ - SMESHGUI_RenumberingDlg.h \ - SMESHGUI_ExtrusionDlg.h \ - SMESHGUI_ExtrusionAlongPathDlg.h \ - SMESHGUI_RevolutionDlg.h \ - SMESHGUI_RotationDlg.h \ - SMESHGUI_TranslationDlg.h \ - SMESHGUI_ScaleDlg.h \ - SMESHGUI_SymmetryDlg.h \ - SMESHGUI_SewingDlg.h \ - SMESHGUI_DuplicateNodesDlg.h \ - SMESHGUI_MergeDlg.h \ - SMESHGUI_MeshUtils.h \ - SMESHGUI_CreatePolyhedralVolumeDlg.h \ - SMESHGUI_Operation.h \ - SMESHGUI_SelectionOp.h \ - SMESHGUI_Dialog.h \ - SMESHGUI_MeshDlg.h \ - SMESHGUI_MeshOp.h \ - SMESHGUI_ShapeByMeshDlg.h \ - SMESHGUI_AddQuadraticElementDlg.h \ - SMESHGUI_ConvToQuadDlg.h \ - SMESHGUI_ConvToQuadOp.h \ - SMESHGUI_BuildCompoundDlg.h \ - SMESHGUI_ComputeDlg.h \ - SMESHGUI_MakeNodeAtPointDlg.h \ - SMESHGUI_MeshEditPreview.h \ - SMESHGUI_IdValidator.h \ - SMESHGUI_MeshInfosBox.h \ - SMESHGUI_Make2DFrom3DOp.h \ - SMESHGUI_FindElemByPointDlg.h \ - SMESHGUI_MeshOrderDlg.h \ - SMESHGUI_MeshOrderOp.h \ - SMESHGUI_FileValidator.h \ - SMESHGUI_CopyMeshDlg.h \ - SMESHGUI_PreviewDlg.h \ - SMESHGUI_ReorientFacesDlg.h \ - SMESHGUI_PropertiesDlg.h \ - SMESHGUI_Add0DElemsOnAllNodesDlg.h \ - SMESH_SMESHGUI.hxx - -# Libraries targets -lib_LTLIBRARIES = libSMESH.la -dist_libSMESH_la_SOURCES = \ - SMESHGUI.cxx \ - SMESHGUI_PatternWidget.cxx \ - SMESHGUI_CreatePatternDlg.cxx \ - SMESHGUI_MeshPatternDlg.cxx \ - SMESHGUI_SpinBox.cxx \ - SMESHGUI_NodesDlg.cxx \ - SMESHGUI_TransparencyDlg.cxx \ - SMESHGUI_ClippingDlg.cxx \ - SMESHGUI_GroupDlg.cxx \ - SMESHGUI_RemoveNodesDlg.cxx \ - SMESHGUI_RemoveElementsDlg.cxx \ - SMESHGUI_MeshInfo.cxx \ - SMESHGUI_Measurements.cxx \ - SMESHGUI_Preferences_ScalarBarDlg.cxx \ - SMESHGUI_AddMeshElementDlg.cxx \ - SMESHGUI_XmlHandler.cxx \ - SMESHGUI_Filter.cxx \ - SMESHGUI_FilterDlg.cxx \ - SMESHGUI_FilterLibraryDlg.cxx \ - SMESHGUI_SingleEditDlg.cxx \ - SMESHGUI_MultiEditDlg.cxx \ - SMESHGUI_DeleteGroupDlg.cxx \ - SMESHGUI_GroupOpDlg.cxx \ - SMESHGUI_SmoothingDlg.cxx \ - SMESHGUI_RenumberingDlg.cxx \ - SMESHGUI_ExtrusionDlg.cxx \ - SMESHGUI_ExtrusionAlongPathDlg.cxx \ - SMESHGUI_RevolutionDlg.cxx \ - SMESHGUI_RotationDlg.cxx \ - SMESHGUI_TranslationDlg.cxx \ - SMESHGUI_ScaleDlg.cxx \ - SMESHGUI_SymmetryDlg.cxx \ - SMESHGUI_SewingDlg.cxx \ - SMESHGUI_DuplicateNodesDlg.cxx \ - SMESHGUI_MergeDlg.cxx \ - SMESHGUI_Utils.cxx \ - SMESHGUI_GEOMGenUtils.cxx \ - SMESHGUI_MeshUtils.cxx \ - SMESHGUI_GroupUtils.cxx \ - SMESHGUI_FilterUtils.cxx \ - SMESHGUI_PatternUtils.cxx \ - SMESHGUI_HypothesesUtils.cxx \ - SMESHGUI_VTKUtils.cxx \ - SMESHGUI_Selection.cxx \ - SMESHGUI_CreatePolyhedralVolumeDlg.cxx \ - SMESHGUI_Operation.cxx \ - SMESHGUI_SelectionOp.cxx \ - SMESHGUI_Dialog.cxx \ - SMESHGUI_MeshDlg.cxx \ - SMESHGUI_MeshOp.cxx \ - SMESHGUI_Displayer.cxx \ - SMESHGUI_Hypotheses.cxx \ - SMESHGUI_ShapeByMeshDlg.cxx \ - SMESHGUI_AddQuadraticElementDlg.cxx \ - SMESHGUI_ConvToQuadDlg.cxx \ - SMESHGUI_ConvToQuadOp.cxx \ - SMESHGUI_BuildCompoundDlg.cxx \ - SMESHGUI_ComputeDlg.cxx \ - SMESHGUI_MakeNodeAtPointDlg.cxx \ - SMESHGUI_MeshEditPreview.cxx \ - SMESHGUI_GroupOnShapeDlg.cxx \ - SMESHGUI_FileInfoDlg.cxx \ - SMESHGUI_MeshInfosBox.cxx \ - SMESHGUI_Make2DFrom3DOp.cxx \ - SMESHGUI_FindElemByPointDlg.cxx \ - SMESHGUI_MeshOrderDlg.cxx \ - SMESHGUI_MeshOrderOp.cxx \ - SMESHGUI_CopyMeshDlg.cxx \ - SMESHGUI_FileValidator.cxx \ - SMESHGUI_PreviewDlg.cxx \ - SMESHGUI_ReorientFacesDlg.cxx \ - SMESHGUI_PropertiesDlg.cxx \ - SMESHGUI_Add0DElemsOnAllNodesDlg.cxx - -MOC_FILES = \ - SMESHGUI_moc.cxx \ - SMESHGUI_PatternWidget_moc.cxx \ - SMESHGUI_MeshPatternDlg_moc.cxx \ - SMESHGUI_CreatePatternDlg_moc.cxx \ - SMESHGUI_NodesDlg_moc.cxx \ - SMESHGUI_SpinBox_moc.cxx \ - SMESHGUI_TransparencyDlg_moc.cxx \ - SMESHGUI_ClippingDlg_moc.cxx \ - SMESHGUI_GroupDlg_moc.cxx \ - SMESHGUI_RemoveNodesDlg_moc.cxx \ - SMESHGUI_RemoveElementsDlg_moc.cxx \ - SMESHGUI_MeshInfo_moc.cxx \ - SMESHGUI_Measurements_moc.cxx \ - SMESHGUI_Preferences_ScalarBarDlg_moc.cxx \ - SMESHGUI_AddMeshElementDlg_moc.cxx \ - SMESHGUI_FilterDlg_moc.cxx \ - SMESHGUI_FilterLibraryDlg_moc.cxx \ - SMESHGUI_SingleEditDlg_moc.cxx \ - SMESHGUI_MultiEditDlg_moc.cxx \ - SMESHGUI_DeleteGroupDlg_moc.cxx \ - SMESHGUI_GroupOpDlg_moc.cxx \ - SMESHGUI_SmoothingDlg_moc.cxx \ - SMESHGUI_RenumberingDlg_moc.cxx \ - SMESHGUI_ExtrusionDlg_moc.cxx \ - SMESHGUI_ExtrusionAlongPathDlg_moc.cxx \ - SMESHGUI_RevolutionDlg_moc.cxx \ - SMESHGUI_RotationDlg_moc.cxx \ - SMESHGUI_TranslationDlg_moc.cxx \ - SMESHGUI_ScaleDlg_moc.cxx \ - SMESHGUI_SymmetryDlg_moc.cxx \ - SMESHGUI_SewingDlg_moc.cxx \ - SMESHGUI_DuplicateNodesDlg_moc.cxx \ - SMESHGUI_MergeDlg_moc.cxx \ - SMESHGUI_CreatePolyhedralVolumeDlg_moc.cxx \ - SMESHGUI_Operation_moc.cxx \ - SMESHGUI_SelectionOp_moc.cxx \ - SMESHGUI_Dialog_moc.cxx \ - SMESHGUI_MeshDlg_moc.cxx \ - SMESHGUI_MeshOp_moc.cxx \ - SMESHGUI_Hypotheses_moc.cxx \ - SMESHGUI_ShapeByMeshDlg_moc.cxx \ - SMESHGUI_AddQuadraticElementDlg_moc.cxx \ - SMESHGUI_ConvToQuadDlg_moc.cxx \ - SMESHGUI_ConvToQuadOp_moc.cxx \ - SMESHGUI_BuildCompoundDlg_moc.cxx \ - SMESHGUI_ComputeDlg_moc.cxx \ - SMESHGUI_MakeNodeAtPointDlg_moc.cxx \ - SMESHGUI_GroupOnShapeDlg_moc.cxx \ - SMESHGUI_FileInfoDlg_moc.cxx \ - SMESHGUI_MeshInfosBox_moc.cxx \ - SMESHGUI_Make2DFrom3DOp_moc.cxx \ - SMESHGUI_FindElemByPointDlg_moc.cxx \ - SMESHGUI_MeshOrderDlg_moc.cxx \ - SMESHGUI_CopyMeshDlg_moc.cxx \ - SMESHGUI_MeshOrderOp_moc.cxx \ - SMESHGUI_PreviewDlg_moc.cxx \ - SMESHGUI_ReorientFacesDlg_moc.cxx \ - SMESHGUI_PropertiesDlg_moc.cxx \ - SMESHGUI_Add0DElemsOnAllNodesDlg_moc.cxx - -nodist_libSMESH_la_SOURCES= \ - $(MOC_FILES) - -# additionnal information to compil and link file -libSMESH_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(OGL_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(QWT_INCLUDES) \ - $(GEOM_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(MED3_INCLUDES) \ - $(HDF5_INCLUDES) \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../SMESHFiltersSelection \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../SMESH \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMESH_I \ - -I$(srcdir)/../Controls \ - -I$(srcdir)/../SMESHClient \ - -I$(srcdir)/../MEDWrapper/Base \ - -I$(top_builddir) \ - -I$(top_builddir)/idl - -libSMESH_la_LDFLAGS = \ - ../SMESHFiltersSelection/libSMESHFiltersSelection.la \ - ../SMDS/libSMDS.la \ - ../Controls/libSMESHControls.la \ - ../OBJECT/libSMESHObject.la \ - $(CAS_LDFLAGS) -lTKV3d \ - $(GUI_LDFLAGS) -lSalomePrs -lsuit -lSUITApp -lCAM -lstd \ - $(GEOM_LDFLAGS) -lGEOMBase -lGEOMFiltersSelection -lGEOMObject \ - $(PYTHON_LIBS) - -# resources files -nodist_salomeres_DATA= \ - SMESH_images.qm \ - SMESH_msg_en.qm \ - SMESH_msg_fr.qm \ - SMESH_msg_ja.qm diff --git a/src/SMESHUtils/CMakeLists.txt b/src/SMESHUtils/CMakeLists.txt new file mode 100644 index 000000000..bd1f13ce4 --- /dev/null +++ b/src/SMESHUtils/CMakeLists.txt @@ -0,0 +1,84 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHDS +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${CAS_TKShHealing} + ${CAS_TKPrim} + ${CAS_TKG2d} + ${CAS_TKG3d} + ${CAS_TKGeomBase} + SMESHDS +) + +# --- headers --- + +# header files / no moc processing +SET(SMESHUtils_HEADERS + SMESH_Block.hxx + SMESH_TypeDefs.hxx + SMESH_Tree.hxx + SMESH_Octree.hxx + SMESH_Quadtree.hxx + SMESH_OctreeNode.hxx + SMESH_Comment.hxx + SMESH_ComputeError.hxx + SMESH_File.hxx + SMESH_Utils.hxx + SMESH_TryCatch.hxx + SMESH_MeshAlgos.hxx +) + +# --- sources --- + +# sources / static +SET(SMESHUtils_SOURCES + SMESH_Block.cxx + SMESH_Quadtree.cxx + SMESH_Octree.cxx + SMESH_OctreeNode.cxx + SMESH_TryCatch.cxx + SMESH_File.cxx + SMESH_MeshAlgos.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMESHUtils ${SMESHUtils_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHUtils ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESHUtils EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SMESHUtils_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SMESHUtils/Makefile.am b/src/SMESHUtils/Makefile.am deleted file mode 100644 index 414ab25ff..000000000 --- a/src/SMESHUtils/Makefile.am +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESH_Block.hxx \ - SMESH_TypeDefs.hxx \ - SMESH_Tree.hxx \ - SMESH_Octree.hxx \ - SMESH_Quadtree.hxx \ - SMESH_OctreeNode.hxx \ - SMESH_Comment.hxx \ - SMESH_ComputeError.hxx \ - SMESH_File.hxx \ - SMESH_Utils.hxx \ - SMESH_TryCatch.hxx \ - SMESH_MeshAlgos.hxx - -# Libraries targets - -lib_LTLIBRARIES = libSMESHUtils.la - -dist_libSMESHUtils_la_SOURCES = \ - SMESH_Block.cxx \ - SMESH_Quadtree.cxx \ - SMESH_Octree.cxx \ - SMESH_OctreeNode.cxx \ - SMESH_TryCatch.cxx \ - SMESH_File.cxx \ - SMESH_MeshAlgos.cxx - -# additionnal information to compile and link file -libSMESHUtils_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS - -libSMESHUtils_la_LDFLAGS = \ - ../SMESHDS/libSMESHDS.la \ - $(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d -lTKG3d -lTKGeomBase diff --git a/src/SMESH_I/CMakeLists.txt b/src/SMESH_I/CMakeLists.txt new file mode 100644 index 000000000..0fc7efbac --- /dev/null +++ b/src/SMESH_I/CMakeLists.txt @@ -0,0 +1,148 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${CAS_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/Controls + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Base + ${PROJECT_SOURCE_DIR}/src/MEDWrapper/Factory + ${PROJECT_SOURCE_DIR}/src/Driver + ${PROJECT_SOURCE_DIR}/src/DriverMED + ${PROJECT_SOURCE_DIR}/src/DriverCGNS + ${PROJECT_SOURCE_DIR}/src/SMESH + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${OMNIORB_DEFINITIONS} + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${Boost_LIBRARIES} + ${KERNEL_OpUtil} + ${KERNEL_SalomeNotification} + ${KERNEL_ResourcesManager} + ${KERNEL_SalomeResourcesManager} + ${KERNEL_SALOMEBasics} + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeNS} + ${KERNEL_Registry} + ${KERNEL_SalomeHDFPersist} + ${KERNEL_SalomeLifeCycleCORBA} + ${KERNEL_TOOLSDS} + ${KERNEL_SalomeGenericObj} + ${KERNEL_SalomeIDLKERNEL} + ${KERNEL_SALOMELocalTrace} + ${CAS_TKCDF} + ${CAS_TKBO} + ${CAS_TKShHealing} + ${GEOM_GEOMClient} + ${GEOM_SalomeIDLGEOM} + SalomeIDLSMESH + SMESHimpl + SMDS + SMESHDS + SMESHControls +) + +# --- headers --- + +# header files / no moc processing +SET(SMESHEngine_HEADERS + SMESH_Gen_i.hxx + SMESH_Algo_i.hxx + SMESH_0D_Algo_i.hxx + SMESH_1D_Algo_i.hxx + SMESH_2D_Algo_i.hxx + SMESH_3D_Algo_i.hxx + SMESH_subMesh_i.hxx + SMESH_Mesh_i.hxx + SMESH_Hypothesis_i.hxx + SMESH_PythonDump.hxx + SMESH_Group_i.hxx + SMESH_Filter_i.hxx + SMESH_MeshEditor_i.hxx + SMESH_Pattern_i.hxx + SMESH_2smeshpy.hxx + SMESH_NoteBook.hxx + SMESH_Measurements_i.hxx + SMESH_PreMeshInfo.hxx + SMESH_MeshPartDS.hxx + SMESH.hxx +) + +# --- sources --- + +# sources / static +SET(SMESHEngine_SOURCES + SMESH_Gen_i.cxx + SMESH_Gen_i_1.cxx + SMESH_DumpPython.cxx + SMESH_Mesh_i.cxx + SMESH_subMesh_i.cxx + SMESH_MeshEditor_i.cxx + SMESH_Hypothesis_i.cxx + SMESH_Algo_i.cxx + SMESH_0D_Algo_i.cxx + SMESH_1D_Algo_i.cxx + SMESH_2D_Algo_i.cxx + SMESH_3D_Algo_i.cxx + SMESH_Filter_i.cxx + SMESH_Group_i.cxx + SMESH_Pattern_i.cxx + SMESH_2smeshpy.cxx + SMESH_NoteBook.cxx + SMESH_Measurements_i.cxx + SMESH_PreMeshInfo.cxx +) + +# bin programs +SET(SMESHEngine_bin_SOURCES + SMESHEngine.cxx +) + +# --- rules --- + +ADD_LIBRARY(SMESHEngine ${SMESHEngine_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS SMESHEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_EXECUTABLE(SMESHEngine_bin ${SMESHEngine_bin_SOURCES}) +TARGET_LINK_LIBRARIES(SMESHEngine_bin ${_link_LIBRARIES}) +SET_TARGET_PROPERTIES(SMESHEngine_bin PROPERTIES OUTPUT_NAME "SMESHEngine") +INSTALL(TARGETS SMESHEngine_bin EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +INSTALL(FILES ${SMESHEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/SMESH_I/Makefile.am b/src/SMESH_I/Makefile.am deleted file mode 100644 index e5ddeed57..000000000 --- a/src/SMESH_I/Makefile.am +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - SMESH_Gen_i.hxx \ - SMESH_Algo_i.hxx \ - SMESH_0D_Algo_i.hxx \ - SMESH_1D_Algo_i.hxx \ - SMESH_2D_Algo_i.hxx \ - SMESH_3D_Algo_i.hxx \ - SMESH_subMesh_i.hxx \ - SMESH_Mesh_i.hxx \ - SMESH_Hypothesis_i.hxx \ - SMESH_PythonDump.hxx \ - SMESH_Group_i.hxx \ - SMESH_Filter_i.hxx \ - SMESH_MeshEditor_i.hxx \ - SMESH_Pattern_i.hxx \ - SMESH_2smeshpy.hxx \ - SMESH_NoteBook.hxx \ - SMESH_Measurements_i.hxx \ - SMESH_PreMeshInfo.hxx \ - SMESH_MeshPartDS.hxx \ - SMESH.hxx - -# Libraries targets - -lib_LTLIBRARIES = libSMESHEngine.la - -dist_libSMESHEngine_la_SOURCES = \ - SMESH_Gen_i.cxx \ - SMESH_Gen_i_1.cxx \ - SMESH_DumpPython.cxx \ - SMESH_Mesh_i.cxx \ - SMESH_subMesh_i.cxx \ - SMESH_MeshEditor_i.cxx \ - SMESH_Hypothesis_i.cxx \ - SMESH_Algo_i.cxx \ - SMESH_0D_Algo_i.cxx \ - SMESH_1D_Algo_i.cxx \ - SMESH_2D_Algo_i.cxx \ - SMESH_3D_Algo_i.cxx \ - SMESH_Filter_i.cxx \ - SMESH_Group_i.cxx \ - SMESH_Pattern_i.cxx \ - SMESH_2smeshpy.cxx \ - SMESH_NoteBook.cxx \ - SMESH_Measurements_i.cxx \ - SMESH_PreMeshInfo.cxx - -# Executables targets -bin_PROGRAMS = SMESHEngine - -dist_SMESHEngine_SOURCES = \ - SMESHEngine.cxx - -# additionnal information to compil and link file -libSMESHEngine_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - @HDF5_INCLUDES@ \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - -I$(srcdir)/../Controls \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../MEDWrapper/Base \ - -I$(srcdir)/../MEDWrapper/Factory \ - -I$(srcdir)/../Driver \ - -I$(srcdir)/../DriverMED \ - -I$(srcdir)/../DriverCGNS \ - -I$(srcdir)/../SMESH \ - -I$(srcdir)/../SMESHUtils \ - -I$(top_builddir)/idl \ - -I$(top_builddir) - -libSMESHEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLSMESH.la \ - ../SMESH/libSMESHimpl.la \ - ../SMDS/libSMDS.la \ - ../SMESHDS/libSMESHDS.la \ - ../Controls/libSMESHControls.la \ - $(KERNEL_LDFLAGS) \ - -lOpUtil \ - -lSalomeNotification \ - -lResourcesManager \ - -lSalomeResourcesManager \ - -lSALOMEBasics \ - -lSalomeContainer \ - -lSalomeNS \ - -lRegistry \ - -lSalomeHDFPersist \ - -lSalomeLifeCycleCORBA \ - -lTOOLSDS \ - -lSalomeGenericObj \ - -lSalomeIDLKernel \ - -lSALOMELocalTrace \ - $(CAS_LDPATH) \ - -lTKCDF \ - -lTKBO \ - -lTKShHealing \ - $(GEOM_LDFLAGS) \ - -lGEOMClient \ - -lSalomeIDLGEOM - -SMESHEngine_CPPFLAGS = \ - $(libSMESHEngine_la_CPPFLAGS) - -SMESHEngine_LDADD = \ - $(libSMESHEngine_la_LDFLAGS) diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx index c831bb28e..f3e20f304 100644 --- a/src/SMESH_I/SMESH_Gen_i.hxx +++ b/src/SMESH_I/SMESH_Gen_i.hxx @@ -439,7 +439,7 @@ public: // Copy-paste methods - returns true if object can be copied to the clipboard CORBA::Boolean CanCopy( SALOMEDS::SObject_ptr theObject ) { return false; } // Copy-paste methods - copy object to the clipboard - SALOMEDS::TMPFile* CopyFrom( SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID ) { return false; } + SALOMEDS::TMPFile* CopyFrom( SALOMEDS::SObject_ptr theObject, CORBA::Long& theObjectID ) { return NULL; } // Copy-paste methods - returns true if object can be pasted from the clipboard CORBA::Boolean CanPaste( const char* theComponentName, CORBA::Long theObjectID ) { return false; } // Copy-paste methods - paste object from the clipboard diff --git a/src/SMESH_PY/CMakeLists.txt b/src/SMESH_PY/CMakeLists.txt new file mode 100644 index 000000000..22f3d372a --- /dev/null +++ b/src/SMESH_PY/CMakeLists.txt @@ -0,0 +1,30 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- scripts --- + +# scripts / static +SET(_bin_SCRIPTS + __init__.py + smeshstudytools.py +) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh) \ No newline at end of file diff --git a/src/SMESH_PY/Makefile.am b/src/SMESH_PY/Makefile.am deleted file mode 100644 index 282400687..000000000 --- a/src/SMESH_PY/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -salomepypkgdir = $(smeshpypkgdir) -salomepypkg_PYTHON = \ - __init__.py \ - smeshstudytools.py diff --git a/src/SMESH_SWIG/CMakeLists.txt b/src/SMESH_SWIG/CMakeLists.txt new file mode 100644 index 000000000..6ca23a0a1 --- /dev/null +++ b/src/SMESH_SWIG/CMakeLists.txt @@ -0,0 +1,107 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- scripts --- + +# scripts / static +SET(_bin_SCRIPTS + smesh.py + batchmode_smesh.py + batchmode_mefisto.py + ex00_all.py + ex01_cube2build.py + ex02_cube2primitive.py + ex03_cube2partition.py + ex04_cube5tetraHexa.py + ex05_hole1build.py + ex06_hole1boolean.py + ex07_hole1partition.py + ex08_hole2build.py + ex09_grid4build.py + ex10_grid4geometry.py + ex11_grid3partition.py + ex12_grid17partition.py + ex13_hole1partial.py + ex14_cyl1holed.py + ex15_cyl2geometry.py + ex16_cyl2complementary.py + ex17_dome1.py + ex18_dome2.py + ex19_sphereINcube.py + ex21_lamp.py + ex24_cylinder.py + ex29_refine.py + ex30_tepal.py + ex30_groupsOp.py + ex31_dimGroup.py + SMESH_test.py + SMESH_test0.py + SMESH_test1.py + SMESH_test1_AndDisplay.py + SMESH_test2.py + SMESH_test3.py + SMESH_test4.py + SMESH_test5.py + SMESH_mechanic.py + SMESH_mechanic_tetra.py + SMESH_mechanic_editor.py + SMESH_mechanic_netgen.py + SMESH_fixation.py + SMESH_fixation_hexa.py + SMESH_fixation_tetra.py + SMESH_fixation_netgen.py + SMESH_box_tetra.py + SMESH_box2_tetra.py + SMESH_box3_tetra.py + SMESH_flight_skin.py + SMESH_Partition1_tetra.py + SMESH_controls.py + SMESH_freebord.py + SMESH_blocks.py + SMESH_BelongToGeom.py + SMESH_GroupFromGeom2.py + SMESH_box.py + SMESH_demo_hexa2_upd.py + SMESH_hexaedre.py + SMESH_Sphere.py + SMESH_GroupFromGeom.py + SMESH_Nut.py + SMESH_GroupLyingOnGeom.py + SMESH_AdvancedEditor.py + SMESH_BuildCompound.py + PAL_MESH_041_mesh.py + PAL_MESH_043_2D.py + PAL_MESH_043_3D.py + SMESH_reg.py +) + +SET(smesh_SCRIPTS + smeshBuilder.py + smesh_algorithm.py +) + +SET(StdMeshers_SCRIPTS + __init__.py + StdMeshersBuilder.py +) +# --- rules --- +SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_PYTHON}) +SALOME_INSTALL_SCRIPTS("${smesh_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh) +SALOME_INSTALL_SCRIPTS("${StdMeshers_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/StdMeshers) +SALOME_INSTALL_SCRIPTS(SMESH_shared_modules.py ${SALOME_INSTALL_PYTHON}/shared_modules) \ No newline at end of file diff --git a/src/SMESH_SWIG/Makefile.am b/src/SMESH_SWIG/Makefile.am deleted file mode 100644 index b42bc694e..000000000 --- a/src/SMESH_SWIG/Makefile.am +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Nicolas REJNERI, Paul RASCLE -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - - -# Scripts to be installed. -dist_salomescript_PYTHON = \ - smesh.py \ - batchmode_smesh.py \ - batchmode_mefisto.py \ - ex00_all.py \ - ex01_cube2build.py \ - ex02_cube2primitive.py \ - ex03_cube2partition.py \ - ex04_cube5tetraHexa.py \ - ex05_hole1build.py \ - ex06_hole1boolean.py \ - ex07_hole1partition.py \ - ex08_hole2build.py \ - ex09_grid4build.py \ - ex10_grid4geometry.py \ - ex11_grid3partition.py \ - ex12_grid17partition.py \ - ex13_hole1partial.py \ - ex14_cyl1holed.py \ - ex15_cyl2geometry.py \ - ex16_cyl2complementary.py \ - ex17_dome1.py \ - ex18_dome2.py \ - ex19_sphereINcube.py \ - ex21_lamp.py \ - ex24_cylinder.py \ - ex29_refine.py \ - ex30_tepal.py \ - ex30_groupsOp.py \ - ex31_dimGroup.py \ - SMESH_test.py\ - SMESH_test0.py\ - SMESH_test1.py \ - SMESH_test1_AndDisplay.py \ - SMESH_test2.py \ - SMESH_test3.py \ - SMESH_test4.py \ - SMESH_test5.py \ - SMESH_mechanic.py \ - SMESH_mechanic_tetra.py \ - SMESH_mechanic_editor.py \ - SMESH_mechanic_netgen.py \ - SMESH_fixation.py \ - SMESH_fixation_hexa.py \ - SMESH_fixation_tetra.py \ - SMESH_fixation_netgen.py \ - SMESH_box_tetra.py \ - SMESH_box2_tetra.py \ - SMESH_box3_tetra.py \ - SMESH_flight_skin.py \ - SMESH_Partition1_tetra.py\ - SMESH_controls.py \ - SMESH_freebord.py \ - SMESH_blocks.py \ - SMESH_BelongToGeom.py \ - SMESH_GroupFromGeom2.py \ - SMESH_box.py \ - SMESH_demo_hexa2_upd.py \ - SMESH_hexaedre.py \ - SMESH_Sphere.py \ - SMESH_GroupFromGeom.py \ - SMESH_Nut.py \ - SMESH_GroupLyingOnGeom.py \ - SMESH_AdvancedEditor.py \ - SMESH_BuildCompound.py \ - PAL_MESH_041_mesh.py \ - PAL_MESH_043_2D.py \ - PAL_MESH_043_3D.py \ - SMESH_reg.py - -mypkgpythondir = $(salomepythondir)/salome/smesh -mypkgpython_PYTHON = \ - smeshBuilder.py \ - smesh_algorithm.py - -stdpkgpythondir = $(salomepythondir)/salome/StdMeshers -stdpkgpython_PYTHON = \ - __init__.py \ - StdMeshersBuilder.py - -sharedpkgpython_PYTHON = \ - SMESH_shared_modules.py diff --git a/src/SMESH_SWIG_WITHIHM/CMakeLists.txt b/src/SMESH_SWIG_WITHIHM/CMakeLists.txt new file mode 100644 index 000000000..ded39676f --- /dev/null +++ b/src/SMESH_SWIG_WITHIHM/CMakeLists.txt @@ -0,0 +1,97 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(${SWIG_USE_FILE}) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${PYTHON_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OGL_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${Boost_INCLUDE_DIRS} + ${CMAKE_CURRENT_SOURCE_DIR} + ${PROJECT_SOURCE_DIR}/src/SMESHGUI + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${OMNIORB_DEFINITIONS} + ${PYTHON_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SalomeGenericObj} + ${KERNEL_SALOMELocalTrace} + ${GUI_CAM} + ${GUI_suit} + ${GUI_qtx} + ${GUI_SalomeApp} + ${GUI_std} + ${GUI_Event} + SMESH +) + +# --- headers --- + +# header files / to be processed by moc +SET(SMESH_Swig_HEADERS + libSMESH_Swig.h + libSMESH_Swig.i +) + +# --- sources --- + +# sources / static +SET(SMESH_Swig_SOURCES + libSMESH_Swig.cxx + ${SMESH_Swig_HEADERS} +) + +# swig flags +SET_SOURCE_FILES_PROPERTIES(libSMESH_Swig.i PROPERTIES CPLUSPLUS ON) +SET_SOURCE_FILES_PROPERTIES(libSMESH_Swig.i PROPERTIES SWIG_DEFINITIONS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libSMESH_swig_wrap.cpp PROPERTIES COMPILE_FLAGS "-DHAVE_CONFIG_H") + +# --- scripts --- + +# scripts / swig wrappings +SET(_swig_SCRIPTS + ${CMAKE_CURRENT_BINARY_DIR}/libSMESH_Swig.py +) + +# --- rules --- + +SWIG_ADD_MODULE(libSMESH_Swig python ${SMESH_Swig_SOURCES}) +SWIG_LINK_LIBRARIES(libSMESH_Swig ${_link_LIBRARIES}) +INSTALL(TARGETS _libSMESH_Swig DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${SMESH_Swig_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) + +SALOME_INSTALL_SCRIPTS("${_swig_SCRIPTS}" ${SALOME_INSTALL_BINS}) diff --git a/src/SMESH_SWIG_WITHIHM/Makefile.am b/src/SMESH_SWIG_WITHIHM/Makefile.am deleted file mode 100644 index 4df4bd032..000000000 --- a/src/SMESH_SWIG_WITHIHM/Makefile.am +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH SMESHGUI : GUI for SMESH component -# File : Makefile.am -# Author : Alexander BORODIN, Open CASCADE S.A.S. -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# =============================================================== -# Swig targets -# =============================================================== -# (cf. http://www.geocities.com/foetsch/python/swig_linux.htm) -# -# Step 1: build the wrapping source files with swig -# -# libSALOME_LifeCycleCORBA.i -- swig --> swig_wrap.cpp -# libSALOME_Swig.py -# -# Step 2: build the dynamic library from cpp built source files and -# dependant libraries. -# -# swig_wrap.cpp -- gcc --> swig_wrap.o |-- link --> _libSMESH_Swig.la -# + | -# dependant libs | -# -# The file libSMESH_Swig.py will be installed to the -# /bin/salome directory. -# The library _libSMESH_Swig.so will be installed to the -# /lib/python/site-package/salome directory. -# - -SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../SMESHGUI -SWIG_SOURCES = libSMESH_Swig.i - -salomeinclude_HEADERS = $(SWIG_SOURCES) libSMESH_Swig.h - -# Libraries targets -lib_LTLIBRARIES = _libSMESH_Swig.la -_libSMESH_Swig_la_SOURCES = $(SWIG_SOURCES) libSMESH_Swig.h libSMESH_Swig.cxx -nodist__libSMESH_Swig_la_SOURCES = swig_wrap.cpp - -_libSMESH_Swig_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(PYTHON_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(OGL_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir) \ - -I$(srcdir)/../SMESHGUI \ - -I$(top_builddir)/idl - -_libSMESH_Swig_la_LDFLAGS = -module -_libSMESH_Swig_la_LIBADD = ../SMESHGUI/libSMESH.la \ - $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace \ - $(GUI_LDFLAGS) -lCAM -lsuit -lqtx -lSalomeApp -lstd -lEvent \ - $(PYTHON_LIBS) $(QT_MT_LIBS) - -swig_wrap.cpp : $(SWIG_SOURCES) - $(SWIG) $(SWIG_FLAGS) -o $@ $< - -libSMESH_Swig.py: swig_wrap.cpp - -CLEANFILES = swig_wrap.cpp libSMESH_Swig.py - -# -# =============================================================== -# Files to be installed -# =============================================================== -# - -# Scripts to be installed (distributed) -dist_salomescript_DATA = - -# Scripts to be installed (non-distributed) -nodist_salomescript_DATA = libSMESH_Swig.py diff --git a/src/StdMeshers/CMakeLists.txt b/src/StdMeshers/CMakeLists.txt new file mode 100644 index 000000000..8ac5d1375 --- /dev/null +++ b/src/StdMeshers/CMakeLists.txt @@ -0,0 +1,188 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories + +IF(SALOME_SMESH_USE_TBB) + SET(TBB_INCLUDES ${TBB_INCLUDE_DIRS}) +ENDIF(SALOME_SMESH_USE_TBB) + +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${PROJECT_SOURCE_DIR}/src/MEFISTO2 + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESH + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/Controls + ${TBB_INCLUDES} +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} +) + +IF(SALOME_SMESH_USE_TBB) + SET(TBB_LIBS ${TBB_LIBRARIES}) +ENDIF(SALOME_SMESH_USE_TBB) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SALOMELocalTrace} + ${KERNEL_OpUtil} + ${CAS_TKAdvTools} + ${CAS_TKTopAlgo} + ${CAS_TKG3d} + SMESHimpl + SMESHDS + MEFISTO2D + ${TBB_LIBS} +) + +# --- headers --- + +# header files / no moc processing +SET(StdMeshers_HEADERS + StdMeshers_LocalLength.hxx + StdMeshers_StartEndLength.hxx + StdMeshers_Arithmetic1D.hxx + StdMeshers_FixedPoints1D.hxx + StdMeshers_NumberOfSegments.hxx + StdMeshers_Deflection1D.hxx + StdMeshers_Propagation.hxx + StdMeshers_LengthFromEdges.hxx + StdMeshers_MaxElementArea.hxx + StdMeshers_MaxElementVolume.hxx + StdMeshers_NotConformAllowed.hxx + StdMeshers_Regular_1D.hxx + StdMeshers_Quadrangle_2D.hxx + StdMeshers_MEFISTO_2D.hxx + StdMeshers_Hexa_3D.hxx + StdMeshers_Penta_3D.hxx + StdMeshers_AutomaticLength.hxx + StdMeshers_Distribution.hxx + StdMeshers_QuadranglePreference.hxx + StdMeshers_QuadraticMesh.hxx + StdMeshers_NumberOfLayers.hxx + StdMeshers_NumberOfLayers2D.hxx + StdMeshers_Prism_3D.hxx + StdMeshers_ProjectionSource1D.hxx + StdMeshers_ProjectionSource2D.hxx + StdMeshers_ProjectionSource3D.hxx + StdMeshers_Projection_1D.hxx + StdMeshers_Projection_2D.hxx + StdMeshers_Projection_3D.hxx + StdMeshers_RadialPrism_3D.hxx + StdMeshers_ProjectionUtils.hxx + StdMeshers_LayerDistribution.hxx + StdMeshers_LayerDistribution2D.hxx + StdMeshers_SegmentAroundVertex_0D.hxx + StdMeshers_SegmentLengthAroundVertex.hxx + StdMeshers_FaceSide.hxx + StdMeshers_CompositeSegment_1D.hxx + StdMeshers_UseExisting_1D2D.hxx + StdMeshers_QuadToTriaAdaptor.hxx + SMESH_StdMeshers.hxx + StdMeshers_CompositeHexa_3D.hxx + StdMeshers_MaxLength.hxx + StdMeshers_QuadrangleParams.hxx + StdMeshers_RadialQuadrangle_1D2D.hxx + StdMeshers_HexaFromSkin_3D.hxx + StdMeshers_ImportSource.hxx + StdMeshers_Import_1D.hxx + StdMeshers_Import_1D2D.hxx + StdMeshers_ViscousLayers.hxx + StdMeshers_ViscousLayers2D.hxx + StdMeshers_Projection_1D2D.hxx + StdMeshers_CartesianParameters3D.hxx + StdMeshers_Cartesian_3D.hxx +) + +# --- sources --- + +# sources / static +SET(StdMeshers_SOURCES + StdMeshers_LocalLength.cxx + StdMeshers_StartEndLength.cxx + StdMeshers_Arithmetic1D.cxx + StdMeshers_FixedPoints1D.cxx + StdMeshers_NumberOfSegments.cxx + StdMeshers_Deflection1D.cxx + StdMeshers_Propagation.cxx + StdMeshers_LengthFromEdges.cxx + StdMeshers_MaxElementArea.cxx + StdMeshers_MaxElementVolume.cxx + StdMeshers_NotConformAllowed.cxx + StdMeshers_Regular_1D.cxx + StdMeshers_Quadrangle_2D.cxx + StdMeshers_MEFISTO_2D.cxx + StdMeshers_Penta_3D.cxx + StdMeshers_Hexa_3D.cxx + StdMeshers_AutomaticLength.cxx + StdMeshers_Distribution.cxx + StdMeshers_QuadranglePreference.cxx + StdMeshers_QuadraticMesh.cxx + StdMeshers_NumberOfLayers.cxx + StdMeshers_NumberOfLayers2D.cxx + StdMeshers_Prism_3D.cxx + StdMeshers_ProjectionSource1D.cxx + StdMeshers_ProjectionSource2D.cxx + StdMeshers_ProjectionSource3D.cxx + StdMeshers_Projection_1D.cxx + StdMeshers_Projection_2D.cxx + StdMeshers_Projection_3D.cxx + StdMeshers_RadialPrism_3D.cxx + StdMeshers_ProjectionUtils.cxx + StdMeshers_LayerDistribution.cxx + StdMeshers_LayerDistribution2D.cxx + StdMeshers_SegmentAroundVertex_0D.cxx + StdMeshers_SegmentLengthAroundVertex.cxx + StdMeshers_FaceSide.cxx + StdMeshers_CompositeSegment_1D.cxx + StdMeshers_UseExisting_1D2D.cxx + StdMeshers_QuadToTriaAdaptor.cxx + StdMeshers_CompositeHexa_3D.cxx + StdMeshers_MaxLength.cxx + StdMeshers_QuadrangleParams.cxx + StdMeshers_RadialQuadrangle_1D2D.cxx + StdMeshers_HexaFromSkin_3D.cxx + StdMeshers_ImportSource.cxx + StdMeshers_Import_1D.cxx + StdMeshers_Import_1D2D.cxx + StdMeshers_ViscousLayers.cxx + StdMeshers_ViscousLayers2D.cxx + StdMeshers_Projection_1D2D.cxx + StdMeshers_CartesianParameters3D.cxx + StdMeshers_Cartesian_3D.cxx +) + +# --- rules --- + +ADD_LIBRARY(StdMeshers ${StdMeshers_SOURCES}) +TARGET_LINK_LIBRARIES(StdMeshers ${_link_LIBRARIES} ) +INSTALL(TARGETS StdMeshers EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${StdMeshers_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/StdMeshers/Makefile.am b/src/StdMeshers/Makefile.am deleted file mode 100644 index 90368398e..000000000 --- a/src/StdMeshers/Makefile.am +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH StdMeshers : implementaion of SMESH idl descriptions -# File : Makefile.in -# Author : Julia DOROVSKIKH -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - StdMeshers_LocalLength.hxx \ - StdMeshers_StartEndLength.hxx \ - StdMeshers_Arithmetic1D.hxx \ - StdMeshers_FixedPoints1D.hxx \ - StdMeshers_NumberOfSegments.hxx \ - StdMeshers_Deflection1D.hxx \ - StdMeshers_Propagation.hxx \ - StdMeshers_LengthFromEdges.hxx \ - StdMeshers_MaxElementArea.hxx \ - StdMeshers_MaxElementVolume.hxx \ - StdMeshers_NotConformAllowed.hxx \ - StdMeshers_Regular_1D.hxx \ - StdMeshers_Quadrangle_2D.hxx \ - StdMeshers_MEFISTO_2D.hxx \ - StdMeshers_Hexa_3D.hxx \ - StdMeshers_Penta_3D.hxx \ - StdMeshers_AutomaticLength.hxx \ - StdMeshers_Distribution.hxx \ - StdMeshers_QuadranglePreference.hxx \ - StdMeshers_QuadraticMesh.hxx \ - StdMeshers_NumberOfLayers.hxx \ - StdMeshers_NumberOfLayers2D.hxx \ - StdMeshers_Prism_3D.hxx \ - StdMeshers_ProjectionSource1D.hxx \ - StdMeshers_ProjectionSource2D.hxx \ - StdMeshers_ProjectionSource3D.hxx \ - StdMeshers_Projection_1D.hxx \ - StdMeshers_Projection_2D.hxx \ - StdMeshers_Projection_3D.hxx \ - StdMeshers_RadialPrism_3D.hxx \ - StdMeshers_ProjectionUtils.hxx \ - StdMeshers_LayerDistribution.hxx \ - StdMeshers_LayerDistribution2D.hxx \ - StdMeshers_SegmentAroundVertex_0D.hxx \ - StdMeshers_SegmentLengthAroundVertex.hxx \ - StdMeshers_FaceSide.hxx \ - StdMeshers_CompositeSegment_1D.hxx \ - StdMeshers_UseExisting_1D2D.hxx \ - StdMeshers_QuadToTriaAdaptor.hxx \ - SMESH_StdMeshers.hxx \ - StdMeshers_CompositeHexa_3D.hxx \ - StdMeshers_MaxLength.hxx \ - StdMeshers_QuadrangleParams.hxx \ - StdMeshers_RadialQuadrangle_1D2D.hxx \ - StdMeshers_HexaFromSkin_3D.hxx \ - StdMeshers_ImportSource.hxx \ - StdMeshers_Import_1D.hxx \ - StdMeshers_Import_1D2D.hxx \ - StdMeshers_ViscousLayers.hxx \ - StdMeshers_ViscousLayers2D.hxx \ - StdMeshers_Projection_1D2D.hxx \ - StdMeshers_CartesianParameters3D.hxx \ - StdMeshers_Cartesian_3D.hxx - -# Libraries targets - -lib_LTLIBRARIES = libStdMeshers.la - -dist_libStdMeshers_la_SOURCES = \ - StdMeshers_LocalLength.cxx \ - StdMeshers_StartEndLength.cxx \ - StdMeshers_Arithmetic1D.cxx \ - StdMeshers_FixedPoints1D.cxx \ - StdMeshers_NumberOfSegments.cxx \ - StdMeshers_Deflection1D.cxx \ - StdMeshers_Propagation.cxx \ - StdMeshers_LengthFromEdges.cxx \ - StdMeshers_MaxElementArea.cxx \ - StdMeshers_MaxElementVolume.cxx \ - StdMeshers_NotConformAllowed.cxx \ - StdMeshers_Regular_1D.cxx \ - StdMeshers_Quadrangle_2D.cxx \ - StdMeshers_MEFISTO_2D.cxx \ - StdMeshers_Penta_3D.cxx \ - StdMeshers_Hexa_3D.cxx \ - StdMeshers_AutomaticLength.cxx \ - StdMeshers_Distribution.cxx \ - StdMeshers_QuadranglePreference.cxx \ - StdMeshers_QuadraticMesh.cxx \ - StdMeshers_NumberOfLayers.cxx \ - StdMeshers_NumberOfLayers2D.cxx \ - StdMeshers_Prism_3D.cxx \ - StdMeshers_ProjectionSource1D.cxx \ - StdMeshers_ProjectionSource2D.cxx \ - StdMeshers_ProjectionSource3D.cxx \ - StdMeshers_Projection_1D.cxx \ - StdMeshers_Projection_2D.cxx \ - StdMeshers_Projection_3D.cxx \ - StdMeshers_RadialPrism_3D.cxx \ - StdMeshers_ProjectionUtils.cxx \ - StdMeshers_LayerDistribution.cxx \ - StdMeshers_LayerDistribution2D.cxx \ - StdMeshers_SegmentAroundVertex_0D.cxx \ - StdMeshers_SegmentLengthAroundVertex.cxx \ - StdMeshers_FaceSide.cxx \ - StdMeshers_CompositeSegment_1D.cxx \ - StdMeshers_UseExisting_1D2D.cxx \ - StdMeshers_QuadToTriaAdaptor.cxx \ - StdMeshers_CompositeHexa_3D.cxx \ - StdMeshers_MaxLength.cxx \ - StdMeshers_QuadrangleParams.cxx \ - StdMeshers_RadialQuadrangle_1D2D.cxx \ - StdMeshers_HexaFromSkin_3D.cxx \ - StdMeshers_ImportSource.cxx \ - StdMeshers_Import_1D.cxx \ - StdMeshers_Import_1D2D.cxx \ - StdMeshers_ViscousLayers.cxx \ - StdMeshers_ViscousLayers2D.cxx \ - StdMeshers_Projection_1D2D.cxx \ - StdMeshers_CartesianParameters3D.cxx \ - StdMeshers_Cartesian_3D.cxx - -# additionnal information to compil and link file -libStdMeshers_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - -I$(srcdir)/../MEFISTO2 \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMESH \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../Controls \ - @PLATFORM_INCLUDES@ - -libStdMeshers_la_LDFLAGS = \ - ../SMESH/libSMESHimpl.la \ - ../SMESHDS/libSMESHDS.la \ - ../MEFISTO2/libMEFISTO2D.la \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil \ - $(CAS_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d - -if WITH_TBB - libStdMeshers_la_CPPFLAGS += $(TBB_INCLUDES) - libStdMeshers_la_LDFLAGS += $(TBB_LIBS) -endif diff --git a/src/StdMeshersGUI/CMakeLists.txt b/src/StdMeshersGUI/CMakeLists.txt new file mode 100644 index 000000000..2725c2443 --- /dev/null +++ b/src/StdMeshersGUI/CMakeLists.txt @@ -0,0 +1,134 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseQt4Ext) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${QT_INCLUDES} + ${VTK_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${PYTHON_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GUI_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${QWT_INCLUDE_DIR} + ${OMNIORB_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/src/SMESH + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESH_I + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHGUI + ${PROJECT_SOURCE_DIR}/src/Controls + ${PROJECT_SOURCE_DIR}/src/StdMeshers + ${PROJECT_SOURCE_DIR}/src/OBJECT + ${PROJECT_SOURCE_DIR}/src/SMESHFiltersSelection + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} + ${OMNIORB_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${GUI_SalomeApp} + ${CAS_TKernel} + ${CAS_TKBO} + ${CAS_TKAdvTools} + SalomeIDLSMESH + SMESHFiltersSelection + SMESH + SMESHObject +) + +# --- headers --- + +# header files / to be processed by moc +SET(_moc_HEADERS + StdMeshersGUI_StdHypothesisCreator.h + StdMeshersGUI_DistrPreview.h + StdMeshersGUI_DistrTable.h + StdMeshersGUI_NbSegmentsCreator.h + StdMeshersGUI_ObjectReferenceParamWdg.h + StdMeshersGUI_QuadrangleParamWdg.h + StdMeshersGUI_LayerDistributionParamWdg.h + StdMeshersGUI_FixedPointsParamWdg.h + StdMeshersGUI_SubShapeSelectorWdg.h + StdMeshersGUI_CartesianParamCreator.h + StdMeshersGUI_RadioButtonsGrpWdg.h +) + +# header files / no moc processing +SET(_other_HEADERS + SMESH_StdMeshersGUI.hxx +) + +# header files / to install +SET(StdMeshersGUI_HEADERS ${_moc_HEADERS} ${_other_HEADERS}) + +# --- sources --- + +# sources / moc wrappings +QT4_WRAP_CPP(_moc_SOURCES ${_moc_HEADERS}) + +# sources / static +SET(_other_SOURCES + StdMeshersGUI.cxx + StdMeshersGUI_StdHypothesisCreator.cxx + StdMeshersGUI_DistrPreview.cxx + StdMeshersGUI_DistrTable.cxx + StdMeshersGUI_NbSegmentsCreator.cxx + StdMeshersGUI_ObjectReferenceParamWdg.cxx + StdMeshersGUI_QuadrangleParamWdg.cxx + StdMeshersGUI_LayerDistributionParamWdg.cxx + StdMeshersGUI_FixedPointsParamWdg.cxx + StdMeshersGUI_SubShapeSelectorWdg.cxx + StdMeshersGUI_CartesianParamCreator.cxx + StdMeshersGUI_RadioButtonsGrpWdg.cxx +) + +# sources / to compile +SET(StdMeshersGUI_SOURCES ${_other_SOURCES} ${_moc_SOURCES}) + +# --- resources --- + +# resource files / to be processed by lrelease +SET(_ts_RESOURCES + StdMeshers_images.ts + StdMeshers_msg_en.ts + StdMeshers_msg_fr.ts + StdMeshers_msg_ja.ts +) + +# --- rules --- + +ADD_LIBRARY(StdMeshersGUI ${StdMeshersGUI_SOURCES}) +TARGET_LINK_LIBRARIES(StdMeshersGUI ${_link_LIBRARIES} ) +INSTALL(TARGETS StdMeshersGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${StdMeshersGUI_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) +QT4_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_SMESH_INSTALL_RES_DATA}") diff --git a/src/StdMeshersGUI/Makefile.am b/src/StdMeshersGUI/Makefile.am deleted file mode 100644 index 237a974d7..000000000 --- a/src/StdMeshersGUI/Makefile.am +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Julia DOROVSKIKH -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - StdMeshersGUI_StdHypothesisCreator.h \ - SMESH_StdMeshersGUI.hxx \ - StdMeshersGUI_DistrPreview.h \ - StdMeshersGUI_DistrTable.h \ - StdMeshersGUI_NbSegmentsCreator.h \ - StdMeshersGUI_ObjectReferenceParamWdg.h \ - StdMeshersGUI_QuadrangleParamWdg.h \ - StdMeshersGUI_LayerDistributionParamWdg.h \ - StdMeshersGUI_FixedPointsParamWdg.h \ - StdMeshersGUI_SubShapeSelectorWdg.h \ - StdMeshersGUI_CartesianParamCreator.h \ - StdMeshersGUI_RadioButtonsGrpWdg.h - -# Libraries targets -lib_LTLIBRARIES = libStdMeshersGUI.la - -dist_libStdMeshersGUI_la_SOURCES = \ - StdMeshersGUI.cxx \ - StdMeshersGUI_StdHypothesisCreator.cxx \ - StdMeshersGUI_DistrPreview.cxx \ - StdMeshersGUI_DistrTable.cxx \ - StdMeshersGUI_NbSegmentsCreator.cxx \ - StdMeshersGUI_ObjectReferenceParamWdg.cxx \ - StdMeshersGUI_QuadrangleParamWdg.cxx \ - StdMeshersGUI_LayerDistributionParamWdg.cxx \ - StdMeshersGUI_FixedPointsParamWdg.cxx \ - StdMeshersGUI_SubShapeSelectorWdg.cxx \ - StdMeshersGUI_CartesianParamCreator.cxx \ - StdMeshersGUI_RadioButtonsGrpWdg.cxx - -MOC_FILES = \ - StdMeshersGUI_StdHypothesisCreator_moc.cxx \ - StdMeshersGUI_DistrPreview_moc.cxx \ - StdMeshersGUI_DistrTable_moc.cxx \ - StdMeshersGUI_NbSegmentsCreator_moc.cxx \ - StdMeshersGUI_ObjectReferenceParamWdg_moc.cxx \ - StdMeshersGUI_QuadrangleParamWdg_moc.cxx \ - StdMeshersGUI_LayerDistributionParamWdg_moc.cxx \ - StdMeshersGUI_FixedPointsParamWdg_moc.cxx \ - StdMeshersGUI_SubShapeSelectorWdg_moc.cxx \ - StdMeshersGUI_CartesianParamCreator_moc.cxx \ - StdMeshersGUI_RadioButtonsGrpWdg_moc.cxx - -nodist_libStdMeshersGUI_la_SOURCES= \ - $(MOC_FILES) - -# additionnal information to compil and link file -libStdMeshersGUI_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(VTK_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(PYTHON_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(QWT_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../SMESH \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMESH_I \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../SMESHGUI \ - -I$(srcdir)/../Controls \ - -I$(srcdir)/../StdMeshers \ - -I$(srcdir)/../OBJECT \ - -I$(srcdir)/../SMESHFiltersSelection \ - -I$(top_builddir)/idl - -libStdMeshersGUI_la_LDFLAGS = \ - ../../idl/libSalomeIDLSMESH.la \ - ../SMESHFiltersSelection/libSMESHFiltersSelection.la \ - ../SMESHGUI/libSMESH.la \ - ../OBJECT/libSMESHObject.la \ - $(GUI_LDFLAGS) -lSalomeApp \ - $(CAS_LDPATH) -lTKernel -lTKBO -lTKAdvTools \ - $(QWT_LIBS) - -# resources files -nodist_salomeres_DATA= \ - StdMeshers_images.qm \ - StdMeshers_msg_en.qm \ - StdMeshers_msg_fr.qm \ - StdMeshers_msg_ja.qm diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h index 6651ff198..f1582f2ba 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h +++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h @@ -35,7 +35,7 @@ #include // CORBA includes -#include +#include #include #include CORBA_SERVER_HEADER(SMESH_Mesh) diff --git a/src/StdMeshers_I/CMakeLists.txt b/src/StdMeshers_I/CMakeLists.txt new file mode 100644 index 000000000..e1a00be7f --- /dev/null +++ b/src/StdMeshers_I/CMakeLists.txt @@ -0,0 +1,171 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${CAS_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} + ${KERNEL_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/src/SMESHImpl + ${PROJECT_SOURCE_DIR}/src/MEFISTO2 + ${PROJECT_SOURCE_DIR}/src/SMESH + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_SOURCE_DIR}/src/SMESH_I + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/Controls + ${PROJECT_SOURCE_DIR}/src/StdMeshers + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} + ${OMNIORB_DEFINITIONS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${KERNEL_SALOMELocalTrace} + ${KERNEL_SalomeGenericObj} + ${CAS_TKBRep} + ${CAS_TKG3d} + SalomeIDLSMESH + StdMeshers + SMESHEngine + SMESHimpl + SMESHDS + ${HDF5_LIBRARIES} + +) + +# --- headers --- + +# header files / no moc processing +SET(StdMeshersEngine_HEADERS + StdMeshers_LocalLength_i.hxx + StdMeshers_StartEndLength_i.hxx + StdMeshers_Arithmetic1D_i.hxx + StdMeshers_FixedPoints1D_i.hxx + StdMeshers_NumberOfSegments_i.hxx + StdMeshers_Deflection1D_i.hxx + StdMeshers_Propagation_i.hxx + StdMeshers_LengthFromEdges_i.hxx + StdMeshers_MaxElementArea_i.hxx + StdMeshers_MaxElementVolume_i.hxx + StdMeshers_NotConformAllowed_i.hxx + StdMeshers_Regular_1D_i.hxx + StdMeshers_Quadrangle_2D_i.hxx + StdMeshers_MEFISTO_2D_i.hxx + StdMeshers_Hexa_3D_i.hxx + StdMeshers_AutomaticLength_i.hxx + StdMeshers_QuadranglePreference_i.hxx + StdMeshers_QuadraticMesh_i.hxx + StdMeshers_NumberOfLayers_i.hxx + StdMeshers_NumberOfLayers2D_i.hxx + StdMeshers_Prism_3D_i.hxx + StdMeshers_ProjectionSource1D_i.hxx + StdMeshers_ProjectionSource2D_i.hxx + StdMeshers_ProjectionSource3D_i.hxx + StdMeshers_Projection_1D_2D_3D_i.hxx + StdMeshers_ObjRefUlils.hxx + StdMeshers_LayerDistribution_i.hxx + StdMeshers_LayerDistribution2D_i.hxx + StdMeshers_CompositeSegment_1D_i.hxx + StdMeshers_SegmentAroundVertex_0D_i.hxx + StdMeshers_SegmentLengthAroundVertex_i.hxx + StdMeshers_UseExisting_1D2D_i.hxx + StdMeshers_MaxLength_i.hxx + StdMeshers_QuadrangleParams_i.hxx + StdMeshers_RadialQuadrangle_1D2D_i.hxx + SMESH_StdMeshers_I.hxx + StdMeshers_ImportSource1D_i.hxx + StdMeshers_ImportSource2D_i.hxx + StdMeshers_Import_1D_i.hxx + StdMeshers_Import_1D2D_i.hxx + StdMeshers_ViscousLayers_i.hxx + StdMeshers_ViscousLayers2D_i.hxx + StdMeshers_CartesianParameters3D_i.hxx + StdMeshers_Cartesian_3D_i.hxx +) + +# --- sources --- + +# sources / static +SET(StdMeshersEngine_SOURCES + StdMeshers_i.cxx + StdMeshers_LocalLength_i.cxx + StdMeshers_StartEndLength_i.cxx + StdMeshers_Arithmetic1D_i.cxx + StdMeshers_FixedPoints1D_i.cxx + StdMeshers_NumberOfSegments_i.cxx + StdMeshers_Deflection1D_i.cxx + StdMeshers_Propagation_i.cxx + StdMeshers_LengthFromEdges_i.cxx + StdMeshers_MaxElementArea_i.cxx + StdMeshers_MaxElementVolume_i.cxx + StdMeshers_NotConformAllowed_i.cxx + StdMeshers_Regular_1D_i.cxx + StdMeshers_Quadrangle_2D_i.cxx + StdMeshers_MEFISTO_2D_i.cxx + StdMeshers_Hexa_3D_i.cxx + StdMeshers_AutomaticLength_i.cxx + StdMeshers_QuadranglePreference_i.cxx + StdMeshers_QuadraticMesh_i.cxx + StdMeshers_NumberOfLayers_i.cxx + StdMeshers_NumberOfLayers2D_i.cxx + StdMeshers_Prism_3D_i.cxx + StdMeshers_ProjectionSource1D_i.cxx + StdMeshers_ProjectionSource2D_i.cxx + StdMeshers_ProjectionSource3D_i.cxx + StdMeshers_Projection_1D_2D_3D_i.cxx + StdMeshers_ObjRefUlils.cxx + StdMeshers_LayerDistribution_i.cxx + StdMeshers_LayerDistribution2D_i.cxx + StdMeshers_CompositeSegment_1D_i.cxx + StdMeshers_SegmentAroundVertex_0D_i.cxx + StdMeshers_SegmentLengthAroundVertex_i.cxx + StdMeshers_UseExisting_1D2D_i.cxx + StdMeshers_MaxLength_i.cxx + StdMeshers_QuadrangleParams_i.cxx + StdMeshers_RadialQuadrangle_1D2D_i.cxx + StdMeshers_ImportSource1D_i.cxx + StdMeshers_ImportSource2D_i.cxx + StdMeshers_Import_1D_i.cxx + StdMeshers_Import_1D2D_i.cxx + StdMeshers_ViscousLayers_i.cxx + StdMeshers_ViscousLayers2D_i.cxx + StdMeshers_CartesianParameters3D_i.cxx + StdMeshers_Cartesian_3D_i.cxx +) + +# --- rules --- + +ADD_LIBRARY(StdMeshersEngine ${StdMeshersEngine_SOURCES}) +TARGET_LINK_LIBRARIES(StdMeshersEngine ${_link_LIBRARIES} ) +INSTALL(TARGETS StdMeshersEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +INSTALL(FILES ${StdMeshersEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/StdMeshers_I/Makefile.am b/src/StdMeshers_I/Makefile.am deleted file mode 100644 index 49ef0788d..000000000 --- a/src/StdMeshers_I/Makefile.am +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# SMESH StdMeshers_I : idl implementation based on 'StdMeshersPlugin' unit's classes -# File : Makefile.in -# Author : Julia DOROVSKIKH -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# header files -salomeinclude_HEADERS = \ - StdMeshers_LocalLength_i.hxx \ - StdMeshers_StartEndLength_i.hxx \ - StdMeshers_Arithmetic1D_i.hxx \ - StdMeshers_FixedPoints1D_i.hxx \ - StdMeshers_NumberOfSegments_i.hxx \ - StdMeshers_Deflection1D_i.hxx \ - StdMeshers_Propagation_i.hxx \ - StdMeshers_LengthFromEdges_i.hxx \ - StdMeshers_MaxElementArea_i.hxx \ - StdMeshers_MaxElementVolume_i.hxx \ - StdMeshers_NotConformAllowed_i.hxx \ - StdMeshers_Regular_1D_i.hxx \ - StdMeshers_Quadrangle_2D_i.hxx \ - StdMeshers_MEFISTO_2D_i.hxx \ - StdMeshers_Hexa_3D_i.hxx \ - StdMeshers_AutomaticLength_i.hxx \ - StdMeshers_QuadranglePreference_i.hxx \ - StdMeshers_QuadraticMesh_i.hxx \ - StdMeshers_NumberOfLayers_i.hxx \ - StdMeshers_NumberOfLayers2D_i.hxx \ - StdMeshers_Prism_3D_i.hxx \ - StdMeshers_ProjectionSource1D_i.hxx \ - StdMeshers_ProjectionSource2D_i.hxx \ - StdMeshers_ProjectionSource3D_i.hxx \ - StdMeshers_Projection_1D_2D_3D_i.hxx \ - StdMeshers_ObjRefUlils.hxx \ - StdMeshers_LayerDistribution_i.hxx \ - StdMeshers_LayerDistribution2D_i.hxx \ - StdMeshers_CompositeSegment_1D_i.hxx \ - StdMeshers_SegmentAroundVertex_0D_i.hxx \ - StdMeshers_SegmentLengthAroundVertex_i.hxx \ - StdMeshers_UseExisting_1D2D_i.hxx \ - StdMeshers_MaxLength_i.hxx \ - StdMeshers_QuadrangleParams_i.hxx \ - StdMeshers_RadialQuadrangle_1D2D_i.hxx \ - SMESH_StdMeshers_I.hxx \ - StdMeshers_ImportSource1D_i.hxx \ - StdMeshers_ImportSource2D_i.hxx \ - StdMeshers_Import_1D_i.hxx \ - StdMeshers_Import_1D2D_i.hxx \ - StdMeshers_ViscousLayers_i.hxx \ - StdMeshers_ViscousLayers2D_i.hxx \ - StdMeshers_CartesianParameters3D_i.hxx \ - StdMeshers_Cartesian_3D_i.hxx - -# Libraries targets -lib_LTLIBRARIES = libStdMeshersEngine.la - -dist_libStdMeshersEngine_la_SOURCES = \ - StdMeshers_i.cxx \ - StdMeshers_LocalLength_i.cxx \ - StdMeshers_StartEndLength_i.cxx \ - StdMeshers_Arithmetic1D_i.cxx \ - StdMeshers_FixedPoints1D_i.cxx \ - StdMeshers_NumberOfSegments_i.cxx \ - StdMeshers_Deflection1D_i.cxx \ - StdMeshers_Propagation_i.cxx \ - StdMeshers_LengthFromEdges_i.cxx \ - StdMeshers_MaxElementArea_i.cxx \ - StdMeshers_MaxElementVolume_i.cxx \ - StdMeshers_NotConformAllowed_i.cxx \ - StdMeshers_Regular_1D_i.cxx \ - StdMeshers_Quadrangle_2D_i.cxx \ - StdMeshers_MEFISTO_2D_i.cxx \ - StdMeshers_Hexa_3D_i.cxx \ - StdMeshers_AutomaticLength_i.cxx \ - StdMeshers_QuadranglePreference_i.cxx \ - StdMeshers_QuadraticMesh_i.cxx \ - StdMeshers_NumberOfLayers_i.cxx \ - StdMeshers_NumberOfLayers2D_i.cxx \ - StdMeshers_Prism_3D_i.cxx \ - StdMeshers_ProjectionSource1D_i.cxx \ - StdMeshers_ProjectionSource2D_i.cxx \ - StdMeshers_ProjectionSource3D_i.cxx \ - StdMeshers_Projection_1D_2D_3D_i.cxx \ - StdMeshers_ObjRefUlils.cxx \ - StdMeshers_LayerDistribution_i.cxx \ - StdMeshers_LayerDistribution2D_i.cxx \ - StdMeshers_CompositeSegment_1D_i.cxx \ - StdMeshers_SegmentAroundVertex_0D_i.cxx \ - StdMeshers_SegmentLengthAroundVertex_i.cxx \ - StdMeshers_UseExisting_1D2D_i.cxx \ - StdMeshers_MaxLength_i.cxx \ - StdMeshers_QuadrangleParams_i.cxx \ - StdMeshers_RadialQuadrangle_1D2D_i.cxx \ - StdMeshers_ImportSource1D_i.cxx \ - StdMeshers_ImportSource2D_i.cxx \ - StdMeshers_Import_1D_i.cxx \ - StdMeshers_Import_1D2D_i.cxx \ - StdMeshers_ViscousLayers_i.cxx \ - StdMeshers_ViscousLayers2D_i.cxx \ - StdMeshers_CartesianParameters3D_i.cxx \ - StdMeshers_Cartesian_3D_i.cxx - -# additionnal information to compil and link file -libStdMeshersEngine_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - @HDF5_INCLUDES@ \ - $(KERNEL_CXXFLAGS) \ - $(GEOM_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../SMESHImpl \ - -I$(srcdir)/../MEFISTO2 \ - -I$(srcdir)/../SMESH \ - -I$(srcdir)/../SMESHUtils \ - -I$(srcdir)/../SMESH_I \ - -I$(srcdir)/../SMESHDS \ - -I$(srcdir)/../SMDS \ - -I$(srcdir)/../Controls \ - -I$(srcdir)/../StdMeshers \ - -I$(top_builddir)/idl - -libStdMeshersEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLSMESH.la \ - ../StdMeshers/libStdMeshers.la \ - ../SMESH_I/libSMESHEngine.la \ - ../SMESH/libSMESHimpl.la \ - ../SMESHDS/libSMESHDS.la \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSalomeGenericObj \ - @HDF5_LIBS@ \ - $(CAS_LDPATH) -lTKBRep -lTKG3d diff --git a/src/Tools/CMakeLists.txt b/src/Tools/CMakeLists.txt new file mode 100644 index 000000000..f23b4d0e0 --- /dev/null +++ b/src/Tools/CMakeLists.txt @@ -0,0 +1,35 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(MeshCut) +ADD_SUBDIRECTORY(padder) + +IF(SALOME_BUILD_GUI) + ADD_SUBDIRECTORY(MGCleanerPlug) + ADD_SUBDIRECTORY(YamsPlug) +ENDIF(SALOME_BUILD_GUI) + +# scripts / static +SET(plugin_SCRIPTS + smesh_plugins.py +) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}) \ No newline at end of file diff --git a/src/Tools/MGCleanerPlug/CMakeLists.txt b/src/Tools/MGCleanerPlug/CMakeLists.txt new file mode 100644 index 000000000..127e849f7 --- /dev/null +++ b/src/Tools/MGCleanerPlug/CMakeLists.txt @@ -0,0 +1,50 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(doc) + +INCLUDE(UsePyQt4) + +# --- scripts --- + +# scripts / static +SET(plugin_SCRIPTS + MGCleanerMonPlugDialog.py + MGCleanerMonViewText.py + MGCleanerplug_plugin.py +) + +# --- resources --- + +# uic files / to be processed by pyuic +SET(_pyuic_files + MGCleanerPlugDialog.ui + MGCleanerViewText.ui +) + +# scripts / pyuic wrappings +PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}) + +IF(SALOME_BUILD_GUI) + SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}) +ENDIF(SALOME_BUILD_GUI) \ No newline at end of file diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py index abff9ed9c..b7e72d423 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py @@ -22,7 +22,7 @@ # Modules Eficas import os, subprocess -from MGCleanerPlugDialog import Ui_MGCleanerPlugDialog +from MGCleanerPlugDialog_ui import Ui_MGCleanerPlugDialog from MGCleanerMonViewText import MGCleanerMonViewText from PyQt4.QtGui import * from PyQt4.QtCore import * diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py index 698bb7ad2..aa8170a97 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py @@ -28,7 +28,7 @@ from PyQt4.QtCore import * # Import des panels -from MGCleanerViewText import Ui_ViewExe +from MGCleanerViewText_ui import Ui_ViewExe class MGCleanerMonViewText(Ui_ViewExe, QDialog): """ diff --git a/src/Tools/MGCleanerPlug/Makefile.am b/src/Tools/MGCleanerPlug/Makefile.am deleted file mode 100644 index efbc7859d..000000000 --- a/src/Tools/MGCleanerPlug/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2007-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -SUBDIRS = doc - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -UIPY_FILES = MGCleanerPlugDialog.py MGCleanerViewText.py - -salomeplugins_PYTHON = \ - MGCleanerMonPlugDialog.py\ - MGCleanerMonViewText.py\ - MGCleanerplug_plugin.py - -nodist_salomeplugins_PYTHON = $(UIPY_FILES) - -CLEANFILES = $(UIPY_FILES) - -EXTRA_DIST += $(UIPY_FILES:%.py=%.ui) - -%.py : %.ui - $(PYUIC) $< -o $@ diff --git a/src/Tools/MGCleanerPlug/doc/CMakeLists.txt b/src/Tools/MGCleanerPlug/doc/CMakeLists.txt new file mode 100755 index 000000000..b2c2b7f6e --- /dev/null +++ b/src/Tools/MGCleanerPlug/doc/CMakeLists.txt @@ -0,0 +1,123 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# This file mainly prepares the environment in which sphinx should run: +# this sets the PYTHONPATH and LD_LIBRARY_PATH to include OMNIORB, DOCUTILS, SETUPTOOLS, etc ... + +# Prepare Sphinx options +SET(SPHINXOPTS +) +SET(SOURCEDIR + ${CMAKE_CURRENT_SOURCE_DIR} +) +SET(SPHINXBUILD + sphinx-build +) +SET(PAPER +) +SET(BUILDDIR + _build +) +SET(CONF_FILE_DIR + ${PROJECT_BINARY_DIR}/src/Tools/MGCleanerPlug/doc +) + +# Internal variables + +SET(PAPEROPT_a4 + -D + latex_paper_size=a4 +) +SET(PAPEROPT_letter + -D + latex_paper_size=letter +) +SET(ALLSPHINXOPTS + -d + ${BUILDDIR}/doctrees + -c + ${CONF_FILE_DIR} + ${PAPEROPT_${PAPER}} + ${SPHINXOPTS} + ${SOURCEDIR} +) + +SALOME_CONFIGURE_FILE(conf.py.in conf.py) + +# Write the shell file preparing the env for the Sphinx run: +# This uses the paths to SPHINX, DOCUTILS and SETUPTOOLS: +# Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake): + +SET(_pydir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +IF(WINDOWS) + STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\lib\\${_pydir}\\site-packages\\salome\;%PYTHONPATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH% + @SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH% + @SET PYTHONPATH=${HDF5_ROOT_DIR}\\lib\;%PYTHONPATH% + @SET PYTHONPATH=${MPI_ROOT_DIR}\\lib\;%PYTHONPATH% + + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\bin\\salome\;%PYTHONPATH% + @SET PATH=${KERNEL_ROOT_DIR}\\lib\\salome\;%PATH% + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH% + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH% + + @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PYTHONPATH% + @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\python\;%PYTHONPATH% + @SET PATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PATH% + ") + SET(EXT "bat") + SET(CALL_STR "call") +ELSE(WINDOWS) + SET(SCR " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH} + export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH} + export PYTHONPATH=${HDF5_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${MPI_ROOT_DIR}/lib:\${PYTHONPATH} + + export PYTHONPATH=${KERNEL_ROOT_DIR}/bin/salome:\${PYTHONPATH} + export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH} + export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH} + export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH} + + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH} + export LD_LIBRARY_PATH=${OMNIORB_ROOT_DIR}/lib:\${LD_LIBRARY_PATH} + export PYTHONPATH=${SETUPTOOLS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${DOCUTILS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${SPHINX_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} +" + ) + SET(EXT "sh") + SET(CALL_STR ".") +ENDIF(WINDOWS) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") + +ADD_CUSTOM_TARGET(html_docs_MGCleanerPlug ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINX_EXECUTABLE} -c ${PROJECT_BINARY_DIR}/doc/docutils -b html ${ALLSPHINXOPTS} docutils) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs_MGCleanerPlug)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils/ DESTINATION ${SALOME_INSTALL_DOC}/gui/SMESH/MGCleaner) diff --git a/src/Tools/MGCleanerPlug/doc/Makefile.am b/src/Tools/MGCleanerPlug/doc/Makefile.am deleted file mode 100644 index d122e7966..000000000 --- a/src/Tools/MGCleanerPlug/doc/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -# Makefile for Sphinx documentation -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -MGCleanerdocdir=$(docdir)/gui/SMESH/MGCleaner - -RSTFILES = lct.rst \ - index.rst \ - editHypo.rst \ - Mandatory_params.rst \ - Generics_params.rst \ - Advanced_params.rst - -EXTRA_DIST += $(RSTFILES) images files - -# You can set these variables from the command line. -SPHINXOPTS = -SOURCEDIR = $(srcdir) -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = _build -CONF_FILE_DIR = $(top_builddir)/src/Tools/MGCleanerPlug/doc - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees -c $(CONF_FILE_DIR) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR) - -.PHONY: help clean html latexpdf - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -install-data-local: $(BUILDDIR)/html/index.html - -test -z $(MGCleanerdocdir) || mkdir -p $(MGCleanerdocdir) && cp -rf $(BUILDDIR)/html/* $(MGCleanerdocdir) ; - -uninstall-local: - -test -d $(MGCleanerdocdir) && chmod -R +w $(MGCleanerdocdir) && rm -rf $(MGCleanerdocdir)/* - -clean-local: - -rm -rf $(BUILDDIR)/* - -$(BUILDDIR)/html/index.html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - diff --git a/src/Tools/MGCleanerPlug/doc/conf.py.in b/src/Tools/MGCleanerPlug/doc/conf.py.in index b8f430700..cb90813a7 100644 --- a/src/Tools/MGCleanerPlug/doc/conf.py.in +++ b/src/Tools/MGCleanerPlug/doc/conf.py.in @@ -42,9 +42,9 @@ copyright = '2013, CEA' # other places throughout the built documents. # # The short X.Y version. -version = '@VERSION@' +version = '@SALOMESMESH_VERSION@' # The full version, including alpha/beta/rc tags. -release = '@VERSION@' +release = '@SALOMESMESH_VERSION@' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/src/Tools/Makefile.am b/src/Tools/Makefile.am deleted file mode 100644 index ad092da9f..000000000 --- a/src/Tools/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2007-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : SMESH -# $Header$ -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = MeshCut padder - -if SMESH_ENABLE_GUI - SUBDIRS += YamsPlug MGCleanerPlug -endif - -salomeplugins_PYTHON = \ - smesh_plugins.py - -DIST_SUBDIRS = MeshCut padder YamsPlug MGCleanerPlug diff --git a/src/Tools/MeshCut/CMakeLists.txt b/src/Tools/MeshCut/CMakeLists.txt new file mode 100644 index 000000000..4bd505ef1 --- /dev/null +++ b/src/Tools/MeshCut/CMakeLists.txt @@ -0,0 +1,86 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +IF(SALOME_BUILD_GUI) + INCLUDE(UsePyQt4) +ENDIF(SALOME_BUILD_GUI) + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${MEDFILE_INCLUDE_DIRS} + ${MEDFILE_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} +) + +# libraries to link to +SET(_link_LIBRARIES + ${HDF5_LIBRARIES} + ${MEDFILE_C_LIBRARIES} +) + +# --- scripts --- + +# scripts / static +SET(plugin_SCRIPTS + meshcut_plugin.py +) + +# bin programs +SET(MeshCut_SOURCES + MeshCut_Globals.hxx + MeshCut_Carre.hxx + MeshCut_Carre.cxx + MeshCut_Cube.hxx + MeshCut_Cube.cxx + MeshCut_Maillage.hxx + MeshCut_Maillage.cxx + MeshCut_Fonctions.hxx + MeshCut_Fonctions.cxx + MeshCut_Utils.hxx + MeshCut_Utils.cxx + MeshCut_Cas.hxx + MeshCut_Cas.cxx + MeshCut_DC.cxx +) + +IF(SALOME_BUILD_GUI) + # --- resources --- + + # uic files / to be processed by pyuic + SET(_pyuic_files + MeshCutDialog.ui + ) + + # scripts / pyuic wrappings + PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) + +ENDIF(SALOME_BUILD_GUI) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}) + +ADD_EXECUTABLE(MeshCut ${MeshCut_SOURCES}) +TARGET_LINK_LIBRARIES(MeshCut ${_link_LIBRARIES}) +INSTALL(TARGETS MeshCut EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_BINS}) + +IF(SALOME_BUILD_GUI) + INSTALL(FILES ${_pyuic_SCRIPTS} DESTINATION ${SALOME_INSTALL_BINS}) +ENDIF(SALOME_BUILD_GUI) diff --git a/src/Tools/MeshCut/Makefile.am b/src/Tools/MeshCut/Makefile.am deleted file mode 100644 index f4fa61e6a..000000000 --- a/src/Tools/MeshCut/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (C) 2007-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - - -bin_PROGRAMS = MeshCut - -MeshCut_SOURCES = \ - MeshCut_Globals.hxx \ - MeshCut_Carre.hxx \ - MeshCut_Carre.cxx \ - MeshCut_Cube.hxx \ - MeshCut_Cube.cxx \ - MeshCut_Maillage.hxx \ - MeshCut_Maillage.cxx \ - MeshCut_Fonctions.hxx \ - MeshCut_Fonctions.cxx \ - MeshCut_Utils.hxx \ - MeshCut_Utils.cxx \ - MeshCut_Cas.hxx \ - MeshCut_Cas.cxx \ - MeshCut_DC.cxx - -MeshCut_CPPFLAGS = $(MED3_INCLUDES) - -MeshCut_LDFLAGS = $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) - -salomeplugins_PYTHON = \ - meshcut_plugin.py - -UIPY_FILES = MeshCutDialog.py - -if SMESH_ENABLE_GUI - nodist_salomescript_SCRIPTS = $(UIPY_FILES) -endif - -CLEANFILES = $(UIPY_FILES) - -EXTRA_DIST += $(UIPY_FILES:%.py=%.ui) - -%.py : %.ui - $(PYUIC) $< -o $@ diff --git a/src/Tools/MeshCut/meshcut_plugin.py b/src/Tools/MeshCut/meshcut_plugin.py index 271b4b151..81a43d383 100644 --- a/src/Tools/MeshCut/meshcut_plugin.py +++ b/src/Tools/MeshCut/meshcut_plugin.py @@ -33,7 +33,7 @@ def MeshCut(context): from PyQt4 import QtGui from PyQt4.QtGui import QFileDialog from PyQt4.QtGui import QMessageBox - from MeshCutDialog import Ui_Dialog + from MeshCutDialog_ui import Ui_Dialog class CutDialog(QtGui.QDialog): diff --git a/src/Tools/YamsPlug/CMakeLists.txt b/src/Tools/YamsPlug/CMakeLists.txt new file mode 100644 index 000000000..e75a744a3 --- /dev/null +++ b/src/Tools/YamsPlug/CMakeLists.txt @@ -0,0 +1,48 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(doc) + +INCLUDE(UsePyQt4) + +# --- scripts --- + +# scripts / static +SET(plugin_SCRIPTS + monYamsPlugDialog.py + monViewText.py + yamsplug_plugin.py +) + +# --- resources --- + +# uic files / to be processed by pyuic +SET(_pyuic_files + YamsPlugDialog.ui + ViewText.ui +) + +# scripts / pyuic wrappings +PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}) + +SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}) \ No newline at end of file diff --git a/src/Tools/YamsPlug/Makefile.am b/src/Tools/YamsPlug/Makefile.am deleted file mode 100644 index e1b8839d0..000000000 --- a/src/Tools/YamsPlug/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2007-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -SUBDIRS = doc - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -UIPY_FILES = YamsPlugDialog.py ViewText.py - -salomeplugins_PYTHON = \ - monYamsPlugDialog.py\ - monViewText.py\ - yamsplug_plugin.py - -nodist_salomeplugins_PYTHON = $(UIPY_FILES) - -CLEANFILES = $(UIPY_FILES) - -EXTRA_DIST += $(UIPY_FILES:%.py=%.ui) - -%.py : %.ui - $(PYUIC) $< -o $@ diff --git a/src/Tools/YamsPlug/doc/CMakeLists.txt b/src/Tools/YamsPlug/doc/CMakeLists.txt new file mode 100755 index 000000000..26484b5f8 --- /dev/null +++ b/src/Tools/YamsPlug/doc/CMakeLists.txt @@ -0,0 +1,104 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# This file mainly prepares the environment in which sphinx should run: +# this sets the PYTHONPATH and LD_LIBRARY_PATH to include OMNIORB, DOCUTILS, SETUPTOOLS, etc ... + +# Prepare Sphinx options +SET(SPHINXOPTS +) +SET(SOURCEDIR + ${CMAKE_CURRENT_SOURCE_DIR} +) +SET(PAPEROPT_a4 + -D + latex_paper_size=a4 +) +SET(ALLSPHINXOPTS + -d + doctrees + ${PAPEROPT_a4} + ${SPHINXOPTS} + ${SOURCEDIR} +) + +SALOME_CONFIGURE_FILE(conf.py.in conf.py) + +# Write the shell file preparing the env for the Sphinx run: +# This uses the paths to SPHINX, DOCUTILS and SETUPTOOLS: +# Their root dir were found when looking for Sphinx (FindSalomeSphinx.cmake): + +SET(_pydir python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) +IF(WINDOWS) + STRING(REPLACE "/" "\\" SCR "@SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\lib\\${_pydir}\\site-packages\\salome\;%PYTHONPATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\bin\\salome\;%PYTHONPATH% + @SET PATH=${CMAKE_INSTALL_PREFIX}\\lib\\salome\;%PATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH% + @SET PYTHONPATH=${CMAKE_INSTALL_PREFIX}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH% + @SET PYTHONPATH=${HDF5_ROOT_DIR}\\lib\;%PYTHONPATH% + @SET PYTHONPATH=${MPI_ROOT_DIR}\\lib\;%PYTHONPATH% + + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\bin\\salome\;%PYTHONPATH% + @SET PATH=${KERNEL_ROOT_DIR}\\lib\\salome\;%PATH% + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON}\;%PYTHONPATH% + @SET PYTHONPATH=${KERNEL_ROOT_DIR}\\${SALOME_INSTALL_PYTHON_SHARED}\;%PYTHONPATH% + + @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PYTHONPATH% + @SET PYTHONPATH=${OMNIORB_ROOT_DIR}\\lib\\python\;%PYTHONPATH% + @SET PATH=${OMNIORB_ROOT_DIR}\\lib\\x86_win32\;%PATH% + ") + SET(EXT "bat") + SET(CALL_STR "call") +ELSE(WINDOWS) + SET(SCR " export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/lib/${_pydir}/site-packages/salome:\${PYTHONPATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/bin/salome:\${PYTHONPATH} + export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib/salome:\${LD_LIBRARY_PATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH} + export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH} + export PYTHONPATH=${HDF5_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${MPI_ROOT_DIR}/lib:\${PYTHONPATH} + + export PYTHONPATH=${KERNEL_ROOT_DIR}/bin/salome:\${PYTHONPATH} + export LD_LIBRARY_PATH=${KERNEL_ROOT_DIR}/lib/salome:\${LD_LIBRARY_PATH} + export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON}:\${PYTHONPATH} + export PYTHONPATH=${KERNEL_ROOT_DIR}/${SALOME_INSTALL_PYTHON_SHARED}:\${PYTHONPATH} + + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORB_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${OMNIORBPY_ROOT_DIR}/lib64/${_pydir}/site-packages:\${PYTHONPATH} + export LD_LIBRARY_PATH=${OMNIORB_ROOT_DIR}/lib:\${LD_LIBRARY_PATH} + export PYTHONPATH=${SETUPTOOLS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${DOCUTILS_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} + export PYTHONPATH=${SPHINX_ROOT_DIR}/lib/${_pydir}/site-packages:\${PYTHONPATH} +" + ) + SET(EXT "sh") + SET(CALL_STR ".") +ENDIF(WINDOWS) + +FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") + +ADD_CUSTOM_TARGET(html_docs_YamsPlug ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINX_EXECUTABLE} -c ${PROJECT_BINARY_DIR}/doc/docutils -b html ${ALLSPHINXOPTS} docutils +) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs_YamsPlug)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils/ DESTINATION ${SALOME_INSTALL_DOC}/gui/SMESH/yams) diff --git a/src/Tools/YamsPlug/doc/Makefile.am b/src/Tools/YamsPlug/doc/Makefile.am deleted file mode 100644 index 2841defc7..000000000 --- a/src/Tools/YamsPlug/doc/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -# Makefile for Sphinx documentation -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -yamsdocdir=$(docdir)/gui/SMESH/yams - -RSTFILES = lct.rst \ - index.rst \ - editHypo.rst \ - Mandatory_params.rst \ - Generics_params.rst \ - Advanced_params.rst - -EXTRA_DIST += $(RSTFILES) images files - -# You can set these variables from the command line. -SPHINXOPTS = -SOURCEDIR = $(srcdir) -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = _build -CONF_FILE_DIR = $(top_builddir)/src/Tools/YamsPlug/doc - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees -c $(CONF_FILE_DIR) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCEDIR) - -.PHONY: help clean html latexpdf - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -install-data-local: $(BUILDDIR)/html/index.html - -test -z $(yamsdocdir) || mkdir -p $(yamsdocdir) && cp -rf $(BUILDDIR)/html/* $(yamsdocdir) ; - -uninstall-local: - -test -d $(yamsdocdir) && chmod -R +w $(yamsdocdir) && rm -rf $(yamsdocdir)/* - -clean-local: - -rm -rf $(BUILDDIR)/* - -$(BUILDDIR)/html/index.html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - diff --git a/src/Tools/YamsPlug/doc/conf.py.in b/src/Tools/YamsPlug/doc/conf.py.in index 0541580dd..dedf61b45 100644 --- a/src/Tools/YamsPlug/doc/conf.py.in +++ b/src/Tools/YamsPlug/doc/conf.py.in @@ -42,9 +42,9 @@ copyright = '2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE' # other places throughout the built documents. # # The short X.Y version. -version = '@VERSION@' +version = '@SALOMESMESH_VERSION@' # The full version, including alpha/beta/rc tags. -release = '@VERSION@' +release = '@SALOMESMESH_VERSION@' # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: diff --git a/src/Tools/YamsPlug/monViewText.py b/src/Tools/YamsPlug/monViewText.py index ce291033b..5402841b8 100644 --- a/src/Tools/YamsPlug/monViewText.py +++ b/src/Tools/YamsPlug/monViewText.py @@ -28,7 +28,7 @@ from PyQt4.QtCore import * # Import des panels -from ViewText import Ui_ViewExe +from ViewText_ui import Ui_ViewExe class MonViewText(Ui_ViewExe, QDialog): """ diff --git a/src/Tools/YamsPlug/monYamsPlugDialog.py b/src/Tools/YamsPlug/monYamsPlugDialog.py index 66b7ff13f..f27bc22b5 100644 --- a/src/Tools/YamsPlug/monYamsPlugDialog.py +++ b/src/Tools/YamsPlug/monYamsPlugDialog.py @@ -22,7 +22,7 @@ # Modules Eficas import os, subprocess -from YamsPlugDialog import Ui_YamsPlugDialog +from YamsPlugDialog_ui import Ui_YamsPlugDialog from monViewText import MonViewText from PyQt4.QtGui import * from PyQt4.QtCore import * diff --git a/src/Tools/padder/CMakeLists.txt b/src/Tools/padder/CMakeLists.txt new file mode 100644 index 000000000..082320ed7 --- /dev/null +++ b/src/Tools/padder/CMakeLists.txt @@ -0,0 +1,24 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(doc) +ADD_SUBDIRECTORY(meshjob) +ADD_SUBDIRECTORY(resources) +ADD_SUBDIRECTORY(spadderpy) +ADD_SUBDIRECTORY(unittests) diff --git a/src/Tools/padder/Makefile.am b/src/Tools/padder/Makefile.am deleted file mode 100644 index 4b65a960d..000000000 --- a/src/Tools/padder/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2007-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -SUBDIRS = meshjob spadderpy unittests resources doc - -EXTRA_DIST = README.txt diff --git a/src/Tools/padder/doc/CMakeLists.txt b/src/Tools/padder/doc/CMakeLists.txt new file mode 100755 index 000000000..a0f5229e3 --- /dev/null +++ b/src/Tools/padder/doc/CMakeLists.txt @@ -0,0 +1,30 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SALOME_CONFIGURE_FILE(doxyfile.in doxyfile) + +ADD_CUSTOM_TARGET(usr_padder_docs ${DOXYGEN_EXECUTABLE}) + +ADD_DEPENDENCIES(usr_padder_docs html_docs) + +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_padder_docs)") +INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/SMESH DESTINATION ${SALOME_INSTALL_DOC}/gui) diff --git a/src/Tools/padder/doc/Makefile.am b/src/Tools/padder/doc/Makefile.am deleted file mode 100755 index 4ca21b93e..000000000 --- a/src/Tools/padder/doc/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# Author : Guillaume Boulant (EDF/R&D) - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -EXTRA_DIST += images input - -# -# The simplest way to extend the documentation of SMESH with the -# documentation for PADDER is to add path to the padder documentation -# in the SMESH gui documentation (see the doxyfile). -# - -# For test purpose, we let the user generate a local dosygen -# documentation including only the local pages -# -test_docs: doxyfile - echo "===========================================" ; \ - echo "Generating PADDER documentation" ; \ - echo "===========================================" ; \ - $(DOXYGEN) doxyfile ; diff --git a/src/Tools/padder/doc/doxyfile.in b/src/Tools/padder/doc/doxyfile.in index 2066f5d84..ffe51fc0d 100755 --- a/src/Tools/padder/doc/doxyfile.in +++ b/src/Tools/padder/doc/doxyfile.in @@ -21,7 +21,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = "SALOME Mesh User's Guide" -OUTPUT_DIRECTORY = . +OUTPUT_DIRECTORY = SMESH CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English TAB_SIZE = 5 @@ -35,20 +35,20 @@ WARNINGS = YES #--------------------------------------------------------------------------- #Input related options #--------------------------------------------------------------------------- -INPUT = @srcdir@/input +INPUT = @CMAKE_CURRENT_SOURCE_DIR@/input FILE_PATTERNS = *.doc EXCLUDE = -IMAGE_PATH = @srcdir@/images -EXAMPLE_PATH = @top_srcdir@/src/SMESH_SWIG +IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images +EXAMPLE_PATH = @PROJECT_SOURCE_DIR@/src/SMESH_SWIG #--------------------------------------------------------------------------- #HTML related options #--------------------------------------------------------------------------- GENERATE_HTML = YES HTML_OUTPUT = . -HTML_HEADER = @top_builddir@/doc/salome/gui/SMESH/static/header.html -HTML_FOOTER = @top_srcdir@/doc/salome/gui/SMESH/static/footer.html -HTML_STYLESHEET = @top_srcdir@/doc/salome/gui/SMESH/static/doxygen.css +HTML_HEADER = @PROJECT_BINARY_DIR@/doc/salome/gui/SMESH/static/header.html +HTML_FOOTER = @PROJECT_SOURCE_DIR@/doc/salome/gui/SMESH/static/footer.html +HTML_STYLESHEET = @PROJECT_SOURCE_DIR@/doc/salome/gui/SMESH/static/doxygen.css TOC_EXPAND = YES DISABLE_INDEX = NO GENERATE_TREEVIEW = YES diff --git a/src/Tools/padder/meshjob/CMakeLists.txt b/src/Tools/padder/meshjob/CMakeLists.txt new file mode 100644 index 000000000..e01960314 --- /dev/null +++ b/src/Tools/padder/meshjob/CMakeLists.txt @@ -0,0 +1,21 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +ADD_SUBDIRECTORY(idl) +ADD_SUBDIRECTORY(impl) diff --git a/src/Tools/padder/meshjob/Makefile.am b/src/Tools/padder/meshjob/Makefile.am deleted file mode 100644 index cc991e24f..000000000 --- a/src/Tools/padder/meshjob/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -SUBDIRS = idl impl diff --git a/src/Tools/padder/meshjob/idl/CMakeLists.txt b/src/Tools/padder/meshjob/idl/CMakeLists.txt new file mode 100755 index 000000000..0a0c6dfab --- /dev/null +++ b/src/Tools/padder/meshjob/idl/CMakeLists.txt @@ -0,0 +1,41 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UseOmniORB) # Provided by KERNEL + +INCLUDE_DIRECTORIES( + ${OMNIORB_INCLUDE_DIR} + ${KERNEL_INCLUDE_DIRS} +) + +SET(SalomeIDLSPADDER_IDLSOURCES + MESHJOB.idl + SPADDERPluginTest.idl +) + +SET(_idl_include_dirs + ${KERNEL_ROOT_DIR}/idl/salome +) + +SET(_idl_link_flags + ${KERNEL_SalomeIDLKernel} +) + +OMNIORB_ADD_MODULE(SalomeIDLSPADDER "${SalomeIDLSPADDER_IDLSOURCES}" "${_idl_include_dirs}" "${_idl_link_flags}") +INSTALL(TARGETS SalomeIDLSPADDER EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) \ No newline at end of file diff --git a/src/Tools/padder/meshjob/idl/Makefile.am b/src/Tools/padder/meshjob/idl/Makefile.am deleted file mode 100644 index 09198e8b8..000000000 --- a/src/Tools/padder/meshjob/idl/Makefile.am +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -# This Makefile is responsible of generating the client and server -# implementation of IDL interfaces for both C++ and python usage. -# The building process of the C++ files is in charge of each source -# package and then is not manage here. -# -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -BUILT_SOURCES = MESHJOBSK.cc -IDL_FILES = MESHJOB.idl - -# For test purpose, we add a little component: -BUILT_SOURCES += SPADDERPluginTestSK.cc -IDL_FILES += SPADDERPluginTest.idl - -IDL_FILES_PY=$(IDL_FILES:%.idl=%_idl.py) - -salomeidl_DATA = $(IDL_FILES) - -lib_LTLIBRARIES = libSalomeIDLSPADDER.la -libSalomeIDLSPADDER_la_SOURCES = -nodist_libSalomeIDLSPADDER_la_SOURCES = $(BUILT_SOURCES) -nodist_salomeinclude_HEADERS= $(IDL_FILES:%idl=%hh) - -OMNIORB_CXXFLAGS=@OMNIORB_CXXFLAGS@ @OMNIORB_INCLUDES@ -OMNIORB_LIBS=@OMNIORB_LIBS@ - -libSalomeIDLSPADDER_la_CXXFLAGS = \ - $(KERNEL_CXXFLAGS) \ - $(OMNIORB_CXXFLAGS) \ - -I. - -libSalomeIDLSPADDER_la_LIBADD = \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel \ - $(OMNIORB_LIBS) - - -# These variables defines the building process of CORBA files -IDLCXXFLAGS = \ - -bcxx -I. \ - @OMNIORB_IDLCXXFLAGS@ \ - -I$(KERNEL_ROOT_DIR)/idl/salome - -IDLPYFLAGS = \ - -I. \ - @OMNIORB_IDLPYFLAGS@ \ - -I$(KERNEL_ROOT_DIR)/idl/salome - -########################################################## -SUFFIXES = .idl .hh SK.cc - -%SK.cc %.hh : %.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $< - -%_idl.py : %.idl - $(OMNIORB_IDL) $(IDLPYFLAGS) $< - -CLEANFILES = *.hh *SK.cc *.py *.hxx *.cxx - -EXTRA_DIST += $(IDL_FILES) - -install-data-local: $(IDL_FILES) - $(INSTALL) -d $(DESTDIR)$(salomepythondir) - ls $^ | while read file; do \ - $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \ - done - -# we want to remove only staff generated for IDL files and nothing more -uninstall-local: - @for modulen in MESHJOB SPADDERPluginTest ; do \ - test -d $(DESTDIR)$(salomepythondir)/$${modulen} && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen} ; \ - test -d $(DESTDIR)$(salomepythondir)/$${modulen}__POA && echo "Removing $(DESTDIR)$(salomepythondir)/$${modulen}__POA" && rm -rf $(DESTDIR)$(salomepythondir)/$${modulen}__POA ; \ - done ; \ - for filen in $(IDL_FILES_PY) ; do \ - echo "Removing $(DESTDIR)$(salomepythondir)/$${filen}" && rm -f $(DESTDIR)$(salomepythondir)/$${filen}* ; \ - done - diff --git a/src/Tools/padder/meshjob/impl/CMakeLists.txt b/src/Tools/padder/meshjob/impl/CMakeLists.txt new file mode 100644 index 000000000..19602bc56 --- /dev/null +++ b/src/Tools/padder/meshjob/impl/CMakeLists.txt @@ -0,0 +1,95 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- options --- +# additional include directories +INCLUDE_DIRECTORIES( + ${KERNEL_INCLUDE_DIRS} + ${GEOM_INCLUDE_DIRS} + ${VTK_INCLUDE_DIRS} + ${CAS_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/src/SMESH + ${PROJECT_SOURCE_DIR}/src/SMESH_I + ${PROJECT_SOURCE_DIR}/src/SMESHDS + ${PROJECT_SOURCE_DIR}/src/SMDS + ${PROJECT_SOURCE_DIR}/src/SMESHUtils + ${PROJECT_BINARY_DIR}/src/Tools/padder/meshjob/idl + ${PROJECT_BINARY_DIR}/idl +) + +# additional preprocessor / compiler flags +ADD_DEFINITIONS( + ${CAS_DEFINITIONS} + ${BOOST_DEFINITIONS} + ${LIBXML2_DEFINITIONS} +) + +# libraries to link to +SET(MeshJobManagerEngine_LIBRARIES + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeKernelHelpers} + ${KERNEL_SalomeLifeCycleCORBA} + SalomeIDLSPADDER +) + +SET(SPADDERPluginTesterEngine_LIBRARIES + ${KERNEL_SalomeContainer} + ${KERNEL_SalomeKernelHelpers} + SMESHimpl + SMESHEngine + SMESHDS + SMDS + SMESHUtils + SalomeIDLSPADDER +) + +# --- headers --- + +# header files / no moc processing +SET(MeshJobManagerEngine_HEADERS + MeshJobManager_i.hxx +) + +# --- sources --- + +# sources / static +SET(MeshJobManagerEngine_SOURCES + MeshJobManager_i.cxx +) + +SET(SPADDERPluginTesterEngine_SOURCES + SPADDERPluginTester_i.hxx + SPADDERPluginTester_i.cxx +) + +# --- rules --- + +ADD_LIBRARY(MeshJobManagerEngine ${MeshJobManagerEngine_SOURCES}) +TARGET_LINK_LIBRARIES(MeshJobManagerEngine ${MeshJobManagerEngine_LIBRARIES} ) +INSTALL(TARGETS MeshJobManagerEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + +ADD_LIBRARY(SPADDERPluginTesterEngine ${SPADDERPluginTesterEngine_SOURCES}) +TARGET_LINK_LIBRARIES(SPADDERPluginTesterEngine ${SPADDERPluginTesterEngine_LIBRARIES} ) +INSTALL(TARGETS SPADDERPluginTesterEngine EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) + + +INSTALL(FILES ${MeshJobManagerEngine_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/Tools/padder/meshjob/impl/Makefile.am b/src/Tools/padder/meshjob/impl/Makefile.am deleted file mode 100644 index c72666449..000000000 --- a/src/Tools/padder/meshjob/impl/Makefile.am +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -AM_CFLAGS=$(SALOME_INCLUDES) -fexceptions - -lib_LTLIBRARIES= libMeshJobManagerEngine.la - -salomeinclude_HEADERS= \ - MeshJobManager_i.hxx - - -# ============================================================= -# Definition of MeshJobManagerEngine construction -# ============================================================= -libMeshJobManagerEngine_la_SOURCES = \ - MeshJobManager_i.cxx - -LIBXML_LIBS=@LIBXML_LIBS@ -KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ - -libMeshJobManagerEngine_la_CXXFLAGS = \ - -I$(top_builddir)/src/Tools/padder/meshjob/idl $(KERNEL_CXXFLAGS) \ - @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@ - -libMeshJobManagerEngine_la_FFLAGS = -fexceptions -libMeshJobManagerEngine_la_LDFLAGS = \ - $(top_builddir)/src/Tools/padder/meshjob/idl/libSalomeIDLSPADDER.la \ - @KERNEL_LDFLAGS@ -lSalomeContainer -lSalomeKernelHelpers -lSalomeLifeCycleCORBA \ - @LIBXML_LIBS@ - -# ============================================================= -# Definition of the SPADDERPluginTester engine construction -# ============================================================= -lib_LTLIBRARIES += libSPADDERPluginTesterEngine.la - -libSPADDERPluginTesterEngine_la_SOURCES = \ - SPADDERPluginTester_i.hxx \ - SPADDERPluginTester_i.cxx - -nodist_libSPADDERPluginTesterEngine_la_SOURCES = - -libSPADDERPluginTesterEngine_la_CXXFLAGS = \ - -I$(top_builddir)/src/Tools/padder/meshjob/idl $(KERNEL_CXXFLAGS) \ - @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @LIBXML_INCLUDES@ - -libSPADDERPluginTesterEngine_la_FFLAGS = -fexceptions -libSPADDERPluginTesterEngine_la_LIBADD = \ - $(top_builddir)/src/Tools/padder/meshjob/idl/libSalomeIDLSPADDER.la \ - @KERNEL_LDFLAGS@ -lSalomeContainer -lSalomeKernelHelpers \ - @LIBXML_LIBS@ - - -# For testing SMESH -# -libSPADDERPluginTesterEngine_la_CXXFLAGS += \ - @GEOM_CXXFLAGS@ \ - -I$(top_builddir)/idl \ - -I$(top_srcdir)/src/SMESH \ - -I$(top_srcdir)/src/SMESH_I \ - -I$(top_srcdir)/src/SMESHDS \ - -I$(top_srcdir)/src/SMDS \ - -I$(top_srcdir)/src/SMESHUtils \ - $(VTK_INCLUDES) $(CAS_CPPFLAGS) $(BOOST_CPPFLAGS) - -libSPADDERPluginTesterEngine_la_LIBADD += \ - $(top_builddir)/src/SMESH/libSMESHimpl.la \ - $(top_builddir)/src/SMESH_I/libSMESHEngine.la \ - $(top_builddir)/src/SMESHDS/libSMESHDS.la \ - $(top_builddir)/src/SMDS/libSMDS.la \ - $(top_builddir)/src/SMESHUtils/libSMESHUtils.la - diff --git a/src/Tools/padder/resources/CMakeLists.txt b/src/Tools/padder/resources/CMakeLists.txt new file mode 100755 index 000000000..f79353f3d --- /dev/null +++ b/src/Tools/padder/resources/CMakeLists.txt @@ -0,0 +1,33 @@ +# Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +SET(PADDER_RESOURCES_FILES + testdata/concrete.med + testdata/ferraill.med + testdata/teststudy.hdf +) + +INSTALL(FILES ${PADDER_RESOURCES_FILES} DESTINATION ${SALOME_SMESH_INSTALL_RES_DATA}/padderdata) + +MESSAGE(STATUS "Creation of ${CMAKE_CURRENT_BINARY_DIR}/SPADDERCatalog.xml") +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/SPADDERCatalog.xml ${CMAKE_CURRENT_BINARY_DIR}/SPADDERCatalog.xml @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/SPADDERCatalog.xml DESTINATION ${SALOME_SMESH_INSTALL_RES_DATA}) \ No newline at end of file diff --git a/src/Tools/padder/resources/Makefile.am b/src/Tools/padder/resources/Makefile.am deleted file mode 100644 index bfb9c6a60..000000000 --- a/src/Tools/padder/resources/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -SUBDIRS = testdata - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -mysalomeresdir=$(salomeresdir) -dist_mysalomeres_DATA = SPADDERCatalog.xml diff --git a/src/Tools/padder/resources/testdata/Makefile.am b/src/Tools/padder/resources/testdata/Makefile.am deleted file mode 100644 index a829828de..000000000 --- a/src/Tools/padder/resources/testdata/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -mysalomeresdir=$(salomeresdir)/padderdata - -dist_mysalomeres_DATA = \ - concrete.med \ - ferraill.med \ - teststudy.hdf - -NOT_USED_FILES = buildparticules.py particules.png -EXTRA_DIST += $(NOT_USED_FILES) diff --git a/src/Tools/padder/spadderpy/CMakeLists.txt b/src/Tools/padder/spadderpy/CMakeLists.txt new file mode 100644 index 000000000..e49653855 --- /dev/null +++ b/src/Tools/padder/spadderpy/CMakeLists.txt @@ -0,0 +1,38 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +IF(SALOME_BUILD_GUI) + ADD_SUBDIRECTORY(gui) + ADD_SUBDIRECTORY(plugin) +ENDIF(SALOME_BUILD_GUI) + +# --- scripts --- + +# scripts / static +SET(py_SCRIPTS + __init__.py + configreader.py +) + +# --- rules --- + +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/padder.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/padder.cfg @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/padder.cfg DESTINATION ${SALOME_SMESH_INSTALL_PLUGINS}) + +SALOME_INSTALL_SCRIPTS("${py_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh/spadder) diff --git a/src/Tools/padder/spadderpy/Makefile.am b/src/Tools/padder/spadderpy/Makefile.am deleted file mode 100644 index ad68fd571..000000000 --- a/src/Tools/padder/spadderpy/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -SUBDIRS = - -if SMESH_ENABLE_GUI -SUBDIRS += gui plugin -endif - -DIST_SUBDIRS = gui plugin - -spadderpydir=$(smeshpypkgdir)/spadder -spadderpy_PYTHON = \ - __init__.py \ - configreader.py - -salomeplugins_DATA = \ - padder.cfg diff --git a/src/Tools/padder/spadderpy/gui/CMakeLists.txt b/src/Tools/padder/spadderpy/gui/CMakeLists.txt new file mode 100644 index 000000000..00b9f990d --- /dev/null +++ b/src/Tools/padder/spadderpy/gui/CMakeLists.txt @@ -0,0 +1,60 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +INCLUDE(UsePyQt4) + +# --- scripts --- + +# scripts / static +SET(py_SCRIPTS + __init__.py + plugindialog.py + inputdialog.py + inputdata.py +) + +# --- resources --- + +# uic files / to be processed by pyuic +SET(spadderpy_DATA + parameters.png + input.png + select.png + compute.png + refresh.png + publish.png + clear.png + addinput.png + deleteinput.png + concrete.png + steelbar.png +) + +SET(_pyuic_files + plugindialog.ui + inputframe.ui +) + +# scripts / pyuic wrappings +PYQT4_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files}) + +# --- rules --- +SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh/spadder/gui) +SALOME_INSTALL_SCRIPTS("${py_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh/spadder/gui) +INSTALL(FILES ${spadderpy_DATA} DESTINATION ${SALOME_INSTALL_PYTHON}/salome/smesh/spadder/gui) diff --git a/src/Tools/padder/spadderpy/gui/Makefile.am b/src/Tools/padder/spadderpy/gui/Makefile.am deleted file mode 100644 index 94d0f5a15..000000000 --- a/src/Tools/padder/spadderpy/gui/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# -# Files that compose the spadder graphical interface used by the -# plugin. They are installed in the spadder python package, under the -# sub-package plugins. -# -spadderpydir=$(smeshpypkgdir)/spadder/gui -dist_spadderpy_PYTHON = \ - __init__.py \ - plugindialog.py \ - inputdialog.py \ - inputdata.py - -PYUIC_FILES = \ - plugindialog_ui.py \ - inputframe_ui.py - -nodist_spadderpy_PYTHON = $(PYUIC_FILES) -CLEANFILES = $(PYUIC_FILES) - -dist_spadderpy_DATA= \ - parameters.png \ - input.png \ - select.png \ - compute.png \ - refresh.png \ - publish.png \ - clear.png \ - addinput.png \ - deleteinput.png \ - concrete.png \ - steelbar.png - -%_ui.py:%.ui - $(PYUIC) -x $< -o $@ - -%_rc.py:%.qrc - $(PYRCC) $< -o $@ - -EXTRA_DIST += $(PYUIC_FILES:%_ui.py=%.ui) diff --git a/src/Tools/padder/spadderpy/plugin/CMakeLists.txt b/src/Tools/padder/spadderpy/plugin/CMakeLists.txt new file mode 100644 index 000000000..e7c481bf2 --- /dev/null +++ b/src/Tools/padder/spadderpy/plugin/CMakeLists.txt @@ -0,0 +1,29 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- scripts --- + +# scripts / static +SET(py_SCRIPTS + spadderPlugin.py +) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${py_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}) diff --git a/src/Tools/padder/spadderpy/plugin/Makefile.am b/src/Tools/padder/spadderpy/plugin/Makefile.am deleted file mode 100644 index 9b5bb9057..000000000 --- a/src/Tools/padder/spadderpy/plugin/Makefile.am +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -# -# Files that strictly concern the SALOME plugins registration and -# configuration. They are installed in a dedicated folder named -# plugins and created in the root installation directory. -# -salomeplugins_PYTHON = \ - spadderPlugin.py - -#salomeplugins_DATA = \ -# envPlugins.sh - - diff --git a/src/Tools/padder/unittests/CMakeLists.txt b/src/Tools/padder/unittests/CMakeLists.txt new file mode 100644 index 000000000..a351ad048 --- /dev/null +++ b/src/Tools/padder/unittests/CMakeLists.txt @@ -0,0 +1,34 @@ +# Copyright (C) 2012-2013 CEA/DEN, EDF R&D, OPEN CASCADE +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# --- scripts --- + +# scripts / static +SET(py_SCRIPTS + __init__.py + usecase_meshJobManager.py + usecase_spadderPluginTester.py +) + +# --- rules --- + +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/autotest.sh.in ${CMAKE_CURRENT_BINARY_DIR}/autotest.sh @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/autotest.sh DESTINATION ${SALOME_INSTALL_BINS}/spadder) + +SALOME_INSTALL_SCRIPTS("${py_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/smesh/spadder/unittests) diff --git a/src/Tools/padder/unittests/Makefile.am b/src/Tools/padder/unittests/Makefile.am deleted file mode 100644 index 28b08fec8..000000000 --- a/src/Tools/padder/unittests/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (C) 2011-2013 EDF R&D -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# - -include $(top_srcdir)/adm_local/unix/make_common_starter.am - -spadderpydir=$(smeshpypkgdir)/spadder/unittests - -spadderpy_PYTHON = \ - __init__.py \ - usecase_meshJobManager.py \ - usecase_spadderPluginTester.py - -spadderbindir=$(bindir)/spadder -spadderbin_SCRIPTS = \ - autotest.sh