From 7f253265345f5e0a1c1555bcfe34af0f969d838f Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Wed, 28 Oct 2015 10:25:25 +0100 Subject: [PATCH] rename SALOME_* options as MEDTOOL_* --- CMakeLists.txt | 164 ++++++++++++------------- src/CMakeLists.txt | 50 ++++---- src/MEDCoupling/CMakeLists.txt | 4 +- src/MEDCoupling_Swig/CMakeLists.txt | 4 +- src/MEDLoader/CMakeLists.txt | 12 +- src/MEDLoader/Swig/CMakeLists.txt | 5 +- src/MEDPartitioner/CMakeLists.txt | 36 +++--- src/MEDPartitioner/Test/CMakeLists.txt | 8 +- src/MEDPartitioner_Swig/CMakeLists.txt | 1 - src/RENUMBER/CMakeLists.txt | 8 +- src/RENUMBER_Swig/CMakeLists.txt | 2 - 11 files changed, 143 insertions(+), 151 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ba75c06cb..a640015e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,19 +46,19 @@ INCLUDE(MEDtoolMacros) # User options # ============ INCLUDE(CMakeDependentOption) -OPTION(SALOME_MED_MICROMED "Build MED without MED file dependancy." OFF) -OPTION(SALOME_MED_ENABLE_PYTHON "Build PYTHON bindings." ON) -OPTION(SALOME_MED_ENABLE_PARTITIONER "Build MEDPartitioner." ON) -OPTION(SALOME_MED_ENABLE_RENUMBER "Build Renumber." ON) -OPTION(SALOME_MED_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON) -OPTION(SALOME_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." OFF) -OPTION(SALOME_BUILD_TESTS "Build MED tests." ON) -OPTION(SALOME_BUILD_DOC "Build MED doc." ON) -CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER" OFF) -CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;NOT SALOME_USE_MPI" OFF) -CMAKE_DEPENDENT_OPTION(SALOME_MED_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "SALOME_MED_ENABLE_PARTITIONER;SALOME_USE_MPI" OFF) +OPTION(MEDTOOL_MED_MICROMED "Build MED without MED file dependancy." OFF) +OPTION(MEDTOOL_MED_ENABLE_PYTHON "Build PYTHON bindings." ON) +OPTION(MEDTOOL_MED_ENABLE_PARTITIONER "Build MEDPartitioner." ON) +OPTION(MEDTOOL_MED_ENABLE_RENUMBER "Build Renumber." ON) +OPTION(MEDTOOL_MED_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON) +OPTION(MEDTOOL_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." OFF) +OPTION(MEDTOOL_BUILD_TESTS "Build MED tests." ON) +OPTION(MEDTOOL_BUILD_DOC "Build MED doc." ON) +CMAKE_DEPENDENT_OPTION(MEDTOOL_MED_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "MEDTOOL_MED_ENABLE_PARTITIONER" OFF) +CMAKE_DEPENDENT_OPTION(MEDTOOL_MED_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "MEDTOOL_MED_ENABLE_PARTITIONER;NOT MEDTOOL_USE_MPI" OFF) +CMAKE_DEPENDENT_OPTION(MEDTOOL_MED_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "MEDTOOL_MED_ENABLE_PARTITIONER;MEDTOOL_USE_MPI" OFF) IF(WIN32) - CMAKE_DEPENDENT_OPTION(SALOME_MED_MEDLOADER_USE_XDR "Enable use of XDR for SauvReader." ON "NOT SALOME_MED_MICROMED" OFF) + CMAKE_DEPENDENT_OPTION(MEDTOOL_MED_MEDLOADER_USE_XDR "Enable use of XDR for SauvReader." ON "NOT MEDTOOL_MED_MICROMED" OFF) ENDIF(WIN32) # @@ -67,7 +67,7 @@ ENDIF(WIN32) LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_files") -IF(NOT SALOME_MED_MICROMED) +IF(NOT MEDTOOL_MED_MICROMED) #FIND_PACKAGE(SalomeHDF5 REQUIRED) #FIND_PACKAGE(SalomeMEDFile REQUIRED) FIND_PACKAGE(HDF5 REQUIRED) @@ -77,43 +77,43 @@ IF(NOT SALOME_MED_MICROMED) #FIND_PACKAGE(SalomeXDR REQUIRED) FIND_PACKAGE(XDR REQUIRED) ELSE(NOT WIN32) - IF(SALOME_MED_MEDLOADER_USE_XDR) + IF(MEDTOOL_MED_MEDLOADER_USE_XDR) FIND_PACKAGE(SalomeXDR REQUIRED) - ENDIF(SALOME_MED_MEDLOADER_USE_XDR) + ENDIF(MEDTOOL_MED_MEDLOADER_USE_XDR) ENDIF(NOT WIN32) # End of XDR Stuff - IF(SALOME_MED_ENABLE_PARTITIONER) + IF(MEDTOOL_MED_ENABLE_PARTITIONER) #FIND_PACKAGE(SalomeLibXml2) - #SALOME_LOG_OPTIONAL_PACKAGE(LibXml2 SALOME_MED_ENABLE_PARTITIONER) + #SALOME_LOG_OPTIONAL_PACKAGE(LibXml2 MEDTOOL_MED_ENABLE_PARTITIONER) IF(DEFINED ENV{LIBXML2_ROOT_DIR}) SET(LIBXML2_ROOT_DIR $ENV{LIBXML2_ROOT_DIR} CACHE PATH "Path to the LibXml2.") LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}") ENDIF() FIND_PACKAGE(LibXml2) - IF(SALOME_MED_PARTITIONER_METIS) + IF(MEDTOOL_MED_PARTITIONER_METIS) #FIND_PACKAGE(SalomeMetis) - #SALOME_LOG_OPTIONAL_PACKAGE(Metis SALOME_MED_PARTITIONER_METIS) + #SALOME_LOG_OPTIONAL_PACKAGE(Metis MEDTOOL_MED_PARTITIONER_METIS) FIND_PACKAGE(Metis) ADD_DEFINITIONS("-DMED_ENABLE_METIS") - ENDIF(SALOME_MED_PARTITIONER_METIS) - IF(SALOME_MED_PARTITIONER_SCOTCH) + ENDIF(MEDTOOL_MED_PARTITIONER_METIS) + IF(MEDTOOL_MED_PARTITIONER_SCOTCH) #FIND_PACKAGE(SalomeScotch) - #SALOME_LOG_OPTIONAL_PACKAGE(Scotch SALOME_MED_PARTITIONER_SCOTCH) + #SALOME_LOG_OPTIONAL_PACKAGE(Scotch MEDTOOL_MED_PARTITIONER_SCOTCH) FIND_PACKAGE(Scotch) ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH") - ENDIF(SALOME_MED_PARTITIONER_SCOTCH) - ENDIF(SALOME_MED_ENABLE_PARTITIONER) -ENDIF(NOT SALOME_MED_MICROMED) + ENDIF(MEDTOOL_MED_PARTITIONER_SCOTCH) + ENDIF(MEDTOOL_MED_ENABLE_PARTITIONER) +ENDIF(NOT MEDTOOL_MED_MICROMED) -ENABLE_TESTING() # let it outsite because even if SALOME_BUILD_TESTS is OFF, python tests that not need additional compilation can be run. +ENABLE_TESTING() # let it outsite because even if MEDTOOL_BUILD_TESTS is OFF, python tests that not need additional compilation can be run. -IF(SALOME_BUILD_TESTS) +IF(MEDTOOL_BUILD_TESTS) #FIND_PACKAGE(SalomeCppUnit) - #SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS) + #SALOME_LOG_OPTIONAL_PACKAGE(CppUnit MEDTOOL_BUILD_TESTS) FIND_PACKAGE(CppUnit) -ENDIF(SALOME_BUILD_TESTS) +ENDIF(MEDTOOL_BUILD_TESTS) -IF(SALOME_USE_MPI) +IF(MEDTOOL_USE_MPI) #FIND_PACKAGE(SalomeMPI REQUIRED) FIND_PACKAGE(MPI REQUIRED) ADD_DEFINITIONS("-DHAVE_MPI") @@ -121,17 +121,17 @@ IF(SALOME_USE_MPI) SET(MPI_LIBRARIES ${MPI_C_LIBRARIES} ${MPI_CXX_LIBRARIES}) SET(MPI_DEFINITIONS "${MPI_CXX_COMPILE_FLAGS}") - IF(SALOME_MED_PARTITIONER_PARMETIS) + IF(MEDTOOL_MED_PARTITIONER_PARMETIS) #FIND_PACKAGE(SalomeParMetis) FIND_PACKAGE(ParMetis) - #SALOME_LOG_OPTIONAL_PACKAGE(ParMetis SALOME_MED_PARTITIONER_PARMETIS) + #SALOME_LOG_OPTIONAL_PACKAGE(ParMetis MEDTOOL_MED_PARTITIONER_PARMETIS) ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS") - ENDIF(SALOME_MED_PARTITIONER_PARMETIS) -ENDIF(SALOME_USE_MPI) + ENDIF(MEDTOOL_MED_PARTITIONER_PARMETIS) +ENDIF(MEDTOOL_USE_MPI) -IF(SALOME_MED_ENABLE_RENUMBER) +IF(MEDTOOL_MED_ENABLE_RENUMBER) #FIND_PACKAGE(SalomeBoost) - #SALOME_LOG_OPTIONAL_PACKAGE(Boost SALOME_MED_ENABLE_RENUMBER) + #SALOME_LOG_OPTIONAL_PACKAGE(Boost MEDTOOL_MED_ENABLE_RENUMBER) IF(DEFINED ENV{BOOST_ROOT_DIR}) SET(BOOST_ROOT_DIR $ENV{BOOST_ROOT_DIR} CACHE PATH "Path to the Boost.") LIST(APPEND CMAKE_PREFIX_PATH "${BOOST_ROOT_DIR}") @@ -142,15 +142,15 @@ IF(SALOME_MED_ENABLE_RENUMBER) SET(Boost_NO_BOOST_CMAKE ON) SET(SalomeBoost_FIND_COMPONENTS filesystem regex signals system thread date_time chrono) FIND_PACKAGE(Boost) -ENDIF(SALOME_MED_ENABLE_RENUMBER) +ENDIF(MEDTOOL_MED_ENABLE_RENUMBER) -IF(SALOME_BUILD_DOC) +IF(MEDTOOL_BUILD_DOC) #FIND_PACKAGE(SalomeDoxygen) #FIND_PACKAGE(SalomeGraphviz) #FIND_PACKAGE(SalomeSphinx) - #SALOME_LOG_OPTIONAL_PACKAGE(Doxygen SALOME_BUILD_DOC) - #SALOME_LOG_OPTIONAL_PACKAGE(Graphviz SALOME_BUILD_DOC) - #SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC) + #SALOME_LOG_OPTIONAL_PACKAGE(Doxygen MEDTOOL_BUILD_DOC) + #SALOME_LOG_OPTIONAL_PACKAGE(Graphviz MEDTOOL_BUILD_DOC) + #SALOME_LOG_OPTIONAL_PACKAGE(Sphinx MEDTOOL_BUILD_DOC) FIND_PACKAGE(Doxygen) IF(DEFINED ENV{GRAPHVIZ_ROOT_DIR}) SET(GRAPHVIZ_ROOT_DIR $ENV{GRAPHVIZ_ROOT_DIR} CACHE PATH "Path to the Graphviz.") @@ -158,13 +158,13 @@ IF(SALOME_BUILD_DOC) ENDIF() FIND_PACKAGE(Graphviz) FIND_PACKAGE(Sphinx) -ENDIF(SALOME_BUILD_DOC) +ENDIF(MEDTOOL_BUILD_DOC) -IF(SALOME_MED_ENABLE_PYTHON) +IF(MEDTOOL_MED_ENABLE_PYTHON) #FIND_PACKAGE(SalomePython) #FIND_PACKAGE(SalomeSWIG) - #SALOME_LOG_OPTIONAL_PACKAGE(Python SALOME_MED_ENABLE_PYTHON) - #SALOME_LOG_OPTIONAL_PACKAGE(SWIG SALOME_MED_ENABLE_PYTHON) + #SALOME_LOG_OPTIONAL_PACKAGE(Python MEDTOOL_MED_ENABLE_PYTHON) + #SALOME_LOG_OPTIONAL_PACKAGE(SWIG MEDTOOL_MED_ENABLE_PYTHON) FIND_PACKAGE(PythonInterp) GET_FILENAME_COMPONENT(_python_dir "${PYTHON_EXECUTABLE}" PATH) GET_FILENAME_COMPONENT(CMAKE_INCLUDE_PATH "${_python_dir}/../include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" ABSOLUTE) @@ -181,7 +181,7 @@ IF(SALOME_MED_ENABLE_PYTHON) IF(SCIPY_FOUND) SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "${SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY};-DWITH_SCIPY") ENDIF(SCIPY_FOUND) -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(MEDTOOL_MED_ENABLE_PYTHON) # Detection report #SALOME_PACKAGE_REPORT_AND_CHECK() @@ -196,23 +196,23 @@ SET(MEDTOOL_INSTALL_LIBS lib CACHE PATH "Install path: MEDtool libs") SET(MEDTOOL_INSTALL_HEADERS include CACHE PATH "Install path: MEDtool headers") SET(MEDTOOL_INSTALL_SCRIPT_SCRIPTS ${MEDTOOL_INSTALL_BINS} CACHE PATH "Install path: MEDtool scripts") SET(MEDTOOL_INSTALL_TESTS tests CACHE PATH "Install path: MEDtool tests") -# SET(SALOME_INSTALL_SCRIPT_DATA ${SALOME_INSTALL_BINS} CACHE PATH +# SET(MEDTOOL_INSTALL_SCRIPT_DATA ${MEDTOOL_INSTALL_BINS} CACHE PATH # "Install path: SALOME script data") SET(MEDTOOL_INSTALL_SCRIPT_PYTHON ${MEDTOOL_INSTALL_BINS} CACHE PATH "Install path: MEDtool Python scripts") -# SET(SALOME_INSTALL_APPLISKEL_SCRIPTS ${SALOME_INSTALL_BINS}/appliskel CACHE PATH +# SET(MEDTOOL_INSTALL_APPLISKEL_SCRIPTS ${MEDTOOL_INSTALL_BINS}/appliskel CACHE PATH # "Install path: SALOME application skeleton - scripts") -# SET(SALOME_INSTALL_APPLISKEL_PYTHON ${SALOME_INSTALL_BINS}/appliskel CACHE PATH +# SET(MEDTOOL_INSTALL_APPLISKEL_PYTHON ${MEDTOOL_INSTALL_BINS}/appliskel CACHE PATH # "Install path: SALOME application skeleton - Python") -# SET(SALOME_INSTALL_CMAKE salome_adm/cmake_files CACHE PATH "Install path: SALOME CMake files") -# SET(SALOME_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH +# SET(MEDTOOL_INSTALL_CMAKE salome_adm/cmake_files CACHE PATH "Install path: SALOME CMake files") +# SET(MEDTOOL_INSTALL_CMAKE_LOCAL adm_local/cmake_files CACHE PATH # "Install path: local SALOME CMake files") -IF(SALOME_MED_ENABLE_PYTHON) +IF(MEDTOOL_MED_ENABLE_PYTHON) SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) SET(MEDTOOL_INSTALL_PYTHON ${_pydir} CACHE PATH "Install path: MEDtool Python stuff") SET(MEDTOOL_INSTALL_PYTHON_SHARED ${MEDTOOL_INSTALL_PYTHON}/shared_modules CACHE PATH "Install path: MEDtool Python shared modules") -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(MEDTOOL_MED_ENABLE_PYTHON) SET(MEDTOOL_INSTALL_RES share/resources CACHE PATH "Install path: MEDTOOL resources") SET(MEDTOOL_INSTALL_DOC share/doc CACHE PATH "Install path: MEDTOOL documentation") @@ -220,25 +220,25 @@ SET(MEDTOOL_INSTALL_DOC share/doc CACHE PATH "Install path: MEDTOOL documentatio # Med specific: SET(MEDTOOL_INSTALL_RES_DATA "${MEDTOOL_INSTALL_RES}/med" CACHE PATH "Install path: MEDTOOL specific data") -#SET(SALOME_MED_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/med" CACHE PATH "Install path: SALOME MED specific scripts") +#SET(MEDTOOL_MED_INSTALL_RES_SCRIPTS "${MEDTOOL_INSTALL_RES}/med" CACHE PATH "Install path: SALOME MED specific scripts") -#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 SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES) -#MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED SALOME_MED_INSTALL_RES_DATA SALOME_MED_INSTALL_RES_SCRIPTS SALOME_INSTALL_DOC) +#MARK_AS_ADVANCED(MEDTOOL_INSTALL_BINS MEDTOOL_INSTALL_LIBS MEDTOOL_INSTALL_IDLS MEDTOOL_INSTALL_HEADERS) +#MARK_AS_ADVANCED(MEDTOOL_INSTALL_SCRIPT_SCRIPTS MEDTOOL_INSTALL_SCRIPT_DATA MEDTOOL_INSTALL_SCRIPT_PYTHON) +#MARK_AS_ADVANCED(MEDTOOL_INSTALL_APPLISKEL_SCRIPTS MEDTOOL_INSTALL_APPLISKEL_PYTHON MEDTOOL_INSTALL_CMAKE MEDTOOL_INSTALL_CMAKE_LOCAL MEDTOOL_INSTALL_RES) +#MARK_AS_ADVANCED(MEDTOOL_INSTALL_PYTHON MEDTOOL_INSTALL_PYTHON_SHARED MEDTOOL_MED_INSTALL_RES_DATA MEDTOOL_MED_INSTALL_RES_SCRIPTS MEDTOOL_INSTALL_DOC) # Header configuration # ==================== MEDTOOL_XVERSION(${PROJECT_NAME}) -#SALOME_CONFIGURE_FILE(MED_version.h.in MED_version.h INSTALL ${SALOME_INSTALL_HEADERS}) -#SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${SALOME_INSTALL_BINS}) +#SALOME_CONFIGURE_FILE(MED_version.h.in MED_version.h INSTALL ${MEDTOOL_INSTALL_HEADERS}) +#SALOME_CONFIGURE_FILE(VERSION.in VERSION INSTALL ${MEDTOOL_INSTALL_BINS}) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/MEDtool_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/MEDtool_version.h) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/MEDtool_version.h DESTINATION ${MEDTOOL_INSTALL_HEADERS}) # Accumulate environment variables for MED module -#SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS} -# ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}) -#SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}) +#SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${MEDTOOL_INSTALL_BINS} +# ${CMAKE_INSTALL_PREFIX}/${MEDTOOL_INSTALL_PYTHON}) +#SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${MEDTOOL_INSTALL_LIBS}) # Sources @@ -251,17 +251,17 @@ ENDIF(WIN32) ADD_SUBDIRECTORY(src) #ADD_SUBDIRECTORY(adm_local) -IF(SALOME_BUILD_DOC) +IF(MEDTOOL_BUILD_DOC) ADD_SUBDIRECTORY(doc) -ENDIF(SALOME_BUILD_DOC) +ENDIF(MEDTOOL_BUILD_DOC) #ADD_SUBDIRECTORY(adm_local_without_kernel) -IF(NOT SALOME_MED_MICROMED) - IF(SALOME_MED_WITH_FILE_EXAMPLES) +IF(NOT MEDTOOL_MED_MICROMED) + IF(MEDTOOL_MED_WITH_FILE_EXAMPLES) ADD_SUBDIRECTORY(resources) - ENDIF(SALOME_MED_WITH_FILE_EXAMPLES) -ENDIF(NOT SALOME_MED_MICROMED) + ENDIF(MEDTOOL_MED_WITH_FILE_EXAMPLES) +ENDIF(NOT MEDTOOL_MED_MICROMED) # Configuration export # ==================== @@ -271,29 +271,29 @@ ENDIF(NOT SALOME_MED_MICROMED) SET(_${PROJECT_NAME}_exposed_targets interpkernel medcoupling medcouplingremapper) -IF(NOT SALOME_MED_MICROMED) +IF(NOT MEDTOOL_MED_MICROMED) LIST(APPEND _${PROJECT_NAME}_exposed_targets medloader) - IF(SALOME_MED_ENABLE_RENUMBER) + IF(MEDTOOL_MED_ENABLE_RENUMBER) LIST(APPEND _${PROJECT_NAME}_exposed_targets renumbercpp) ENDIF() - IF(SALOME_MED_ENABLE_PARTITIONER) + IF(MEDTOOL_MED_ENABLE_PARTITIONER) LIST(APPEND _${PROJECT_NAME}_exposed_targets medpartitionercpp) - IF(SALOME_BUILD_TESTS) + IF(MEDTOOL_BUILD_TESTS) LIST(APPEND _${PROJECT_NAME}_exposed_targets MEDPARTITIONERTest) ENDIF() ENDIF() - IF(SALOME_BUILD_TESTS) + IF(MEDTOOL_BUILD_TESTS) LIST(APPEND _${PROJECT_NAME}_exposed_targets InterpKernelTest) ENDIF() ENDIF() -IF(SALOME_USE_MPI) +IF(MEDTOOL_USE_MPI) LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedmem) - IF(NOT SALOME_MED_MICROMED) + IF(NOT MEDTOOL_MED_MICROMED) LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedloader) ENDIF() - IF(SALOME_BUILD_TESTS) - IF(NOT SALOME_MED_MICROMED) + IF(MEDTOOL_BUILD_TESTS) + IF(NOT MEDTOOL_MED_MICROMED) LIST(APPEND _${PROJECT_NAME}_exposed_targets ParaMEDMEMTest) ENDIF() ENDIF() @@ -340,8 +340,8 @@ SET(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}") # INCLUDE(CMakePackageConfigHelpers) # CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in # ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake -# INSTALL_DESTINATION "${SALOME_INSTALL_CMAKE}_LOCAL" -# PATH_VARS CONF_INCLUDE_DIRS SALOME_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX +# INSTALL_DESTINATION "${MEDTOOL_INSTALL_CMAKE}_LOCAL" +# PATH_VARS CONF_INCLUDE_DIRS MEDTOOL_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX # KERNEL_ROOT_DIR GUI_ROOT_DIR MEDFILE_ROOT_DIR MPI_ROOT_DIR # HDF5_ROOT_DIR OMNIORB_ROOT_DIR PTHREAD_ROOT_DIR BOOST_ROOT_DIR # SWIG_ROOT_DIR PYTHON_ROOT_DIR CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR @@ -355,8 +355,8 @@ SET(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}") # INSTALL(FILES # "${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake" # "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" -# DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}") +# DESTINATION "${MEDTOOL_INSTALL_CMAKE_LOCAL}") # Install the export set for use with the install-tree -#INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${SALOME_INSTALL_CMAKE_LOCAL}" +#INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${MEDTOOL_INSTALL_CMAKE_LOCAL}" # FILE ${PROJECT_NAME}Targets.cmake) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 725c1e0db..7065864f5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,48 +15,48 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -SET(MED_ENABLE_MICROMED ${SALOME_MED_MICROMED}) +SET(MED_ENABLE_MICROMED ${MEDTOOL_MED_MICROMED}) ADD_SUBDIRECTORY(INTERP_KERNEL) -IF(SALOME_BUILD_TESTS) +IF(MEDTOOL_BUILD_TESTS) ADD_SUBDIRECTORY(INTERP_KERNELTest) -ENDIF(SALOME_BUILD_TESTS) +ENDIF(MEDTOOL_BUILD_TESTS) ADD_SUBDIRECTORY(MEDCoupling) -IF(SALOME_MED_ENABLE_PYTHON) +IF(MEDTOOL_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(MEDCoupling_Swig) -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(MEDTOOL_MED_ENABLE_PYTHON) -IF(NOT SALOME_MED_MICROMED) +IF(NOT MEDTOOL_MED_MICROMED) ADD_SUBDIRECTORY(MEDLoader) - IF(SALOME_MED_ENABLE_RENUMBER) + IF(MEDTOOL_MED_ENABLE_RENUMBER) ADD_SUBDIRECTORY(RENUMBER) - IF(SALOME_MED_ENABLE_PYTHON) + IF(MEDTOOL_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(RENUMBER_Swig) - ENDIF(SALOME_MED_ENABLE_PYTHON) - ENDIF(SALOME_MED_ENABLE_RENUMBER) - IF(SALOME_MED_ENABLE_PARTITIONER) + ENDIF(MEDTOOL_MED_ENABLE_PYTHON) + ENDIF(MEDTOOL_MED_ENABLE_RENUMBER) + IF(MEDTOOL_MED_ENABLE_PARTITIONER) ADD_SUBDIRECTORY(MEDPartitioner) - IF(SALOME_MED_ENABLE_PYTHON) + IF(MEDTOOL_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(MEDPartitioner_Swig) - ENDIF(SALOME_MED_ENABLE_PYTHON) - ENDIF(SALOME_MED_ENABLE_PARTITIONER) -ENDIF(NOT SALOME_MED_MICROMED) + ENDIF(MEDTOOL_MED_ENABLE_PYTHON) + ENDIF(MEDTOOL_MED_ENABLE_PARTITIONER) +ENDIF(NOT MEDTOOL_MED_MICROMED) -IF(SALOME_USE_MPI) +IF(MEDTOOL_USE_MPI) ADD_SUBDIRECTORY(ParaMEDMEM) - IF(NOT SALOME_MED_MICROMED) + IF(NOT MEDTOOL_MED_MICROMED) ADD_SUBDIRECTORY(ParaMEDLoader) - ENDIF(NOT SALOME_MED_MICROMED) - IF(SALOME_MED_ENABLE_PYTHON) + ENDIF(NOT MEDTOOL_MED_MICROMED) + IF(MEDTOOL_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(ParaMEDMEM_Swig) - ENDIF(SALOME_MED_ENABLE_PYTHON) - IF(SALOME_BUILD_TESTS) - IF(NOT SALOME_MED_MICROMED) + ENDIF(MEDTOOL_MED_ENABLE_PYTHON) + IF(MEDTOOL_BUILD_TESTS) + IF(NOT MEDTOOL_MED_MICROMED) ADD_SUBDIRECTORY(ParaMEDMEMTest) - ENDIF(NOT SALOME_MED_MICROMED) - ENDIF(SALOME_BUILD_TESTS) -ENDIF(SALOME_USE_MPI) + ENDIF(NOT MEDTOOL_MED_MICROMED) + ENDIF(MEDTOOL_BUILD_TESTS) +ENDIF(MEDTOOL_USE_MPI) # Application tests INSTALL(FILES CTestTestfileInstall.cmake diff --git a/src/MEDCoupling/CMakeLists.txt b/src/MEDCoupling/CMakeLists.txt index 2d7d53fcb..a2c70dafb 100644 --- a/src/MEDCoupling/CMakeLists.txt +++ b/src/MEDCoupling/CMakeLists.txt @@ -18,9 +18,9 @@ # # Author : Anthony Geay (CEA/DEN) -IF(SALOME_BUILD_TESTS) +IF(MEDTOOL_BUILD_TESTS) ADD_SUBDIRECTORY(Test) -ENDIF(SALOME_BUILD_TESTS) +ENDIF(MEDTOOL_BUILD_TESTS) INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/../.. diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt index 59cef51d2..963bbd974 100644 --- a/src/MEDCoupling_Swig/CMakeLists.txt +++ b/src/MEDCoupling_Swig/CMakeLists.txt @@ -53,7 +53,7 @@ SET (SWIG_MODULE_MEDCoupling_EXTRA_DEPS ${MEDCoupling_SWIG_DPYS_FILES} # SWIG must run after the doc if we want to have the docstrings extracted from Doxygen # into the Python module: -IF(SALOME_BUILD_DOC) +IF(MEDTOOL_BUILD_DOC) LIST(APPEND SWIG_MODULE_MEDCoupling_EXTRA_FLAGS -DWITH_DOCSTRINGS) LIST(APPEND SWIG_MODULE_MEDCoupling_EXTRA_DEPS ${PROJECT_BINARY_DIR}/doc/MEDCoupling_doc.i @@ -81,8 +81,6 @@ IF(WIN32) ENDIF(WIN32) INSTALL(TARGETS ${SWIG_MODULE_MEDCoupling_REAL_NAME} ${SWIG_MODULE_MEDCouplingRemapper_REAL_NAME} DESTINATION ${MEDTOOL_INSTALL_PYTHON}) -#SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDCoupling.py ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingRemapper.py) -#SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/MEDCoupling.py ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingRemapper.py DESTINATION ${MEDTOOL_INSTALL_PYTHON}) INSTALL(FILES MEDCoupling.i MEDCouplingCommon.i MEDCouplingRefCountObject.i MEDCouplingMemArray.i MEDCouplingFieldDiscretization.i MEDCouplingTimeDiscretization.i MEDCouplingFinalize.i MEDCouplingRemapper.i MEDCouplingTypemaps.i MEDCouplingDataArrayTypemaps.i DESTINATION ${MEDTOOL_INSTALL_HEADERS}) diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt index 4794ef2e3..4a58ecd03 100644 --- a/src/MEDLoader/CMakeLists.txt +++ b/src/MEDLoader/CMakeLists.txt @@ -20,23 +20,23 @@ ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS}) -IF(SALOME_MED_ENABLE_PYTHON) +IF(MEDTOOL_MED_ENABLE_PYTHON) ADD_SUBDIRECTORY(Swig) -ENDIF(SALOME_MED_ENABLE_PYTHON) +ENDIF(MEDTOOL_MED_ENABLE_PYTHON) -IF(SALOME_BUILD_TESTS) +IF(MEDTOOL_BUILD_TESTS) ADD_SUBDIRECTORY(Test) -ENDIF(SALOME_BUILD_TESTS) +ENDIF(MEDTOOL_BUILD_TESTS) SET(MEDLOADER_XDR_INCLUDE_DIRS) SET(MEDLOADER_XDR_LIBRARIES) IF(WIN32) - IF(SALOME_MED_MEDLOADER_USE_XDR) + IF(MEDTOOL_MED_MEDLOADER_USE_XDR) ADD_DEFINITIONS(-DNOMINMAX) SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS}) SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES}) - ENDIF(SALOME_MED_MEDLOADER_USE_XDR) + ENDIF(MEDTOOL_MED_MEDLOADER_USE_XDR) ELSE(WIN32) SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS}) ENDIF(WIN32) diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt index 99a282168..abd498e67 100644 --- a/src/MEDLoader/Swig/CMakeLists.txt +++ b/src/MEDLoader/Swig/CMakeLists.txt @@ -54,7 +54,7 @@ SET (SWIG_MODULE_MEDLoader_EXTRA_DEPS ${MEDLoader_SWIG_DPYS_FILES} # SWIG must run after the doc if we want to have the docstrings extracted from Doxygen # into the Python module: -IF(SALOME_BUILD_DOC) +IF(MEDTOOL_BUILD_DOC) LIST(APPEND SWIG_MODULE_MEDLoader_EXTRA_FLAGS -DWITH_DOCSTRINGS) LIST(APPEND SWIG_MODULE_MEDLoader_EXTRA_DEPS ${PROJECT_BINARY_DIR}/doc/MEDLoader_doc.i @@ -70,9 +70,6 @@ ENDIF(WIN32) INSTALL(TARGETS _MEDLoader DESTINATION ${MEDTOOL_INSTALL_PYTHON}) INSTALL(FILES MEDLoader.i MEDLoaderTypemaps.i MEDLoaderCommon.i DESTINATION ${MEDTOOL_INSTALL_HEADERS}) -#SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDLoader.py) -#SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_PYTHON}) -#INSTALL(FILES "${PYFILES_TO_INSTALL}" DESTINATION ${MEDTOOL_INSTALL_PYTHON}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/MEDLoader.py DESTINATION ${MEDTOOL_INSTALL_PYTHON}) INSTALL(FILES MEDLoaderDataForTest.py MEDLoaderTest.py MEDLoaderTest2.py MEDLoaderTest3.py MEDLoaderTest4.py SauvLoaderTest.py MEDLoaderExamplesTest.py MEDLoaderCouplingTrainingSession.py CaseIO.py CaseReader.py CaseWriter.py VTKReader.py MEDLoaderSplitter.py medutilities.py DESTINATION ${MEDTOOL_INSTALL_SCRIPT_SCRIPTS}) diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt index a57506609..d537059fe 100644 --- a/src/MEDPartitioner/CMakeLists.txt +++ b/src/MEDPartitioner/CMakeLists.txt @@ -33,37 +33,37 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints ) -IF(SALOME_MED_PARTITIONER_METIS) +IF(MEDTOOL_MED_PARTITIONER_METIS) ADD_DEFINITIONS(${METIS_DEFINITIONS}) IF(MEDTOOL_METIS_V5) ADD_DEFINITIONS("-DMED_ENABLE_METIS_V5") ENDIF(MEDTOOL_METIS_V5) INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIRS}) -ENDIF(SALOME_MED_PARTITIONER_METIS) +ENDIF(MEDTOOL_MED_PARTITIONER_METIS) ######## # VERY IMPORTANT PUT METIS BEFORE SCOTCH because # metis.h is also in SCOTCH install dir !!! ######## -IF(SALOME_MED_PARTITIONER_SCOTCH) +IF(MEDTOOL_MED_PARTITIONER_SCOTCH) ADD_DEFINITIONS(${SCOTCH_DEFINITIONS}) INCLUDE_DIRECTORIES(${SCOTCH_INCLUDE_DIRS}) -ENDIF(SALOME_MED_PARTITIONER_SCOTCH) +ENDIF(MEDTOOL_MED_PARTITIONER_SCOTCH) -IF(SALOME_MED_PARTITIONER_PARMETIS) +IF(MEDTOOL_MED_PARTITIONER_PARMETIS) ADD_DEFINITIONS(${PARMETIS_DEFINITIONS}) INCLUDE_DIRECTORIES(${PARMETIS_INCLUDE_DIRS}) -ENDIF(SALOME_MED_PARTITIONER_PARMETIS) +ENDIF(MEDTOOL_MED_PARTITIONER_PARMETIS) -IF(SALOME_USE_MPI) +IF(MEDTOOL_USE_MPI) ADD_DEFINITIONS(${MPI_DEFINITIONS}) INCLUDE_DIRECTORIES(${MPI_INCLUDE_DIRS}) -ENDIF(SALOME_USE_MPI) +ENDIF(MEDTOOL_USE_MPI) -IF(SALOME_BUILD_TESTS) +IF(MEDTOOL_BUILD_TESTS) ADD_SUBDIRECTORY(Test) -ENDIF(SALOME_BUILD_TESTS) +ENDIF(MEDTOOL_BUILD_TESTS) SET(medpartitionercpp_HEADERS_HXX MEDPARTITIONER_MeshCollection.hxx @@ -106,33 +106,33 @@ SET(medpartitionercpp_LDFLAGS medcoupling medloader ) -IF(SALOME_MED_PARTITIONER_PARMETIS) +IF(MEDTOOL_MED_PARTITIONER_PARMETIS) SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_ParMetisGraph.hxx) SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_ParMetisGraph.cxx MEDPARTITIONER_MetisGraph.cxx) SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${PARMETIS_DEFINITIONS}") SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${PARMETIS_LIBRARIES}) -ENDIF(SALOME_MED_PARTITIONER_PARMETIS) -IF(SALOME_MED_PARTITIONER_METIS) +ENDIF(MEDTOOL_MED_PARTITIONER_PARMETIS) +IF(MEDTOOL_MED_PARTITIONER_METIS) SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_MetisGraph.hxx) SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_MetisGraph.cxx) SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${METIS_DEFINITIONS}") SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${METIS_LIBRARIES}) -ENDIF(SALOME_MED_PARTITIONER_METIS) -IF(SALOME_MED_PARTITIONER_SCOTCH) +ENDIF(MEDTOOL_MED_PARTITIONER_METIS) +IF(MEDTOOL_MED_PARTITIONER_SCOTCH) SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_ScotchGraph.hxx) SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_ScotchGraph.cxx) SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${SCOTCH_DEFINITIONS}") SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${SCOTCH_LIBRARIES}) -ENDIF(SALOME_MED_PARTITIONER_SCOTCH) +ENDIF(MEDTOOL_MED_PARTITIONER_SCOTCH) -IF(${SALOME_USE_MPI}) +IF(${MEDTOOL_USE_MPI}) SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_UtilsPara.cxx MEDPARTITIONER_JointFinder.cxx) ADD_EXECUTABLE(medpartitioner_para medpartitioner_para.cxx) SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${MPI_LIBRARIES}) SET_TARGET_PROPERTIES(medpartitioner_para PROPERTIES COMPILE_FLAGS "${medpartitionercpp_DEFINITIONS}") TARGET_LINK_LIBRARIES(medpartitioner_para medpartitionercpp ${medpartitionercpp_LDFLAGS}) INSTALL(TARGETS medpartitioner_para DESTINATION ${MEDTOOL_INSTALL_BINS}) -ENDIF(${SALOME_USE_MPI}) +ENDIF(${MEDTOOL_USE_MPI}) ADD_DEFINITIONS(${medpartitionercpp_DEFINITIONS}) diff --git a/src/MEDPartitioner/Test/CMakeLists.txt b/src/MEDPartitioner/Test/CMakeLists.txt index c1dd6f3bf..01ce48441 100644 --- a/src/MEDPartitioner/Test/CMakeLists.txt +++ b/src/MEDPartitioner/Test/CMakeLists.txt @@ -35,11 +35,11 @@ SET(MEDPARTITIONERTest_SOURCES SET(MEDPARTITIONERTest_LDFLAGS medpartitionercpp ${CPPUNIT_LIBRARIES}) -IF(SALOME_USE_MPI) - IF(SALOME_MED_PARTITIONER_PARMETIS) +IF(MEDTOOL_USE_MPI) + IF(MEDTOOL_MED_PARTITIONER_PARMETIS) SET(MEDPARTITIONERTest_SOURCES ${MEDPARTITIONERTest_SOURCES} MEDPARTITIONERTestPara.cxx) - ENDIF(SALOME_MED_PARTITIONER_PARMETIS) -ENDIF(SALOME_USE_MPI) + ENDIF(MEDTOOL_MED_PARTITIONER_PARMETIS) +ENDIF(MEDTOOL_USE_MPI) ADD_LIBRARY(MEDPARTITIONERTest SHARED ${MEDPARTITIONERTest_SOURCES}) TARGET_LINK_LIBRARIES(MEDPARTITIONERTest ${MEDPARTITIONERTest_LDFLAGS}) diff --git a/src/MEDPartitioner_Swig/CMakeLists.txt b/src/MEDPartitioner_Swig/CMakeLists.txt index 2715371a5..865d9e694 100644 --- a/src/MEDPartitioner_Swig/CMakeLists.txt +++ b/src/MEDPartitioner_Swig/CMakeLists.txt @@ -56,7 +56,6 @@ ENDIF(WIN32) INSTALL(TARGETS ${SWIG_MODULE_MEDPartitioner_REAL_NAME} DESTINATION ${MEDTOOL_INSTALL_PYTHON}) SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDPartitioner.py) -#SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_SCRIPT_PYTHON}) INSTALL(FILES "${PYFILES_TO_INSTALL}" DESTINATION ${MEDTOOL_INSTALL_SCRIPT_PYTHON}) INSTALL(FILES MEDPartitioner.i MEDPartitionerCommon.i DESTINATION ${MEDTOOL_INSTALL_HEADERS}) diff --git a/src/RENUMBER/CMakeLists.txt b/src/RENUMBER/CMakeLists.txt index baef96da9..5c55762e0 100644 --- a/src/RENUMBER/CMakeLists.txt +++ b/src/RENUMBER/CMakeLists.txt @@ -36,10 +36,10 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints ) -IF(SALOME_USE_MPI) +IF(MEDTOOL_USE_MPI) ADD_DEFINITIONS(${MPI_DEFINITIONS}) INCLUDE_DIRECTORIES(${MPI_INCLUDE_DIRS}) -ENDIF(SALOME_USE_MPI) +ENDIF(MEDTOOL_USE_MPI) SET(renumbercpp_HEADERS_HXX RENUMBER_Renumbering.hxx @@ -79,9 +79,9 @@ IF(Boost_FOUND) SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${BOOST_LIBRARIES}) ENDIF(Boost_FOUND) -IF(SALOME_USE_MPI) +IF(MEDTOOL_USE_MPI) SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${MPI_LIBRARIES}) -ENDIF(SALOME_USE_MPI) +ENDIF(MEDTOOL_USE_MPI) ADD_EXECUTABLE(renumber ${renumber_SOURCES}) SET_TARGET_PROPERTIES(renumber PROPERTIES COMPILE_FLAGS "${renumber_DEFINITIONS}") diff --git a/src/RENUMBER_Swig/CMakeLists.txt b/src/RENUMBER_Swig/CMakeLists.txt index afd126fcb..4af9a715b 100644 --- a/src/RENUMBER_Swig/CMakeLists.txt +++ b/src/RENUMBER_Swig/CMakeLists.txt @@ -59,8 +59,6 @@ IF(WIN32) ENDIF(WIN32) INSTALL(TARGETS ${SWIG_MODULE_MEDRenumber_REAL_NAME} DESTINATION ${MEDTOOL_INSTALL_PYTHON}) -#SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDRenumber.py) -#SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${SALOME_INSTALL_SCRIPT_PYTHON}) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/MEDRenumber.py DESTINATION ${MEDTOOL_INSTALL_SCRIPT_PYTHON}) INSTALL(FILES MEDRenumber.i MEDRenumberCommon.i DESTINATION ${MEDTOOL_INSTALL_HEADERS}) -- 2.39.2