Turned all MEDCOUPLING_MED_xyz into MEDCOUPLING_xyz

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eab4b3ffd8b22f7770fae3031076dc47e746723d..5fb5104f6eb0606bf2aa0807ee05460536544495 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,52 +45,52 @@ INCLUDE(SalomeSetupPlatform)
 # User options
 # ============
 INCLUDE(CMakeDependentOption)
-OPTION(MEDCOUPLING_MED_MICROMED "Build MED without MED file dependancy." OFF)
-OPTION(MEDCOUPLING_MED_ENABLE_PYTHON "Build PYTHON bindings." ON)
-OPTION(MEDCOUPLING_MED_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
-OPTION(MEDCOUPLING_MED_ENABLE_RENUMBER "Build Renumber." ON)
-OPTION(MEDCOUPLING_MED_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON)
+OPTION(MEDCOUPLING_MICROMED "Build MED without MED file dependancy." OFF)
+OPTION(MEDCOUPLING_ENABLE_PYTHON "Build PYTHON bindings." ON)
+OPTION(MEDCOUPLING_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
+OPTION(MEDCOUPLING_ENABLE_RENUMBER "Build Renumber." ON)
+OPTION(MEDCOUPLING_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON)
 OPTION(MEDCOUPLING_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." OFF)
 OPTION(MEDCOUPLING_BUILD_TESTS "Build MED tests." ON)
 OPTION(MEDCOUPLING_BUILD_DOC "Build MED doc." ON)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER" OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER;NOT MEDCOUPLING_USE_MPI" OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER;NOT MEDCOUPLING_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "MEDCOUPLING_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
 IF(WIN32)
-  CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_MEDLOADER_USE_XDR "Enable use of XDR for SauvReader." ON "NOT MEDCOUPLING_MED_MICROMED" OFF)
+  CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MEDLOADER_USE_XDR "Enable use of XDR for SauvReader." ON "NOT MEDCOUPLING_MICROMED" OFF)
 ENDIF(WIN32)
 
 #
 # Set list of prerequisites
 # =========================
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   FIND_PACKAGE(SalomeHDF5 REQUIRED)
   FIND_PACKAGE(SalomeMEDFile REQUIRED)
   # XDR stuff
   IF(NOT WIN32)
     FIND_PACKAGE(SalomeXDR REQUIRED)
   ELSE(NOT WIN32)
-    IF(MEDCOUPLING_MED_MEDLOADER_USE_XDR)
+    IF(MEDCOUPLING_MEDLOADER_USE_XDR)
       FIND_PACKAGE(SalomeXDR REQUIRED)
-    ENDIF(MEDCOUPLING_MED_MEDLOADER_USE_XDR)
+    ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR)
   ENDIF(NOT WIN32)
   # End of XDR Stuff
-  IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
     FIND_PACKAGE(SalomeLibXml2)
-    SALOME_LOG_OPTIONAL_PACKAGE(LibXml2 MEDCOUPLING_MED_ENABLE_PARTITIONER)
-    IF(MEDCOUPLING_MED_PARTITIONER_METIS)
+    SALOME_LOG_OPTIONAL_PACKAGE(LibXml2 MEDCOUPLING_ENABLE_PARTITIONER)
+    IF(MEDCOUPLING_PARTITIONER_METIS)
       FIND_PACKAGE(SalomeMetis)
-      SALOME_LOG_OPTIONAL_PACKAGE(Metis MEDCOUPLING_MED_PARTITIONER_METIS)
+      SALOME_LOG_OPTIONAL_PACKAGE(Metis MEDCOUPLING_PARTITIONER_METIS)
       ADD_DEFINITIONS("-DMED_ENABLE_METIS")
-    ENDIF(MEDCOUPLING_MED_PARTITIONER_METIS)
-    IF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
+    ENDIF(MEDCOUPLING_PARTITIONER_METIS)
+    IF(MEDCOUPLING_PARTITIONER_SCOTCH)
       FIND_PACKAGE(SalomeScotch)
-      SALOME_LOG_OPTIONAL_PACKAGE(Scotch MEDCOUPLING_MED_PARTITIONER_SCOTCH)
+      SALOME_LOG_OPTIONAL_PACKAGE(Scotch MEDCOUPLING_PARTITIONER_SCOTCH)
       ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH")
-    ENDIF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
-  ENDIF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+    ENDIF(MEDCOUPLING_PARTITIONER_SCOTCH)
+  ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
 ENABLE_TESTING() # let it outsite because even if MEDCOUPLING_BUILD_TESTS is OFF, python tests that not need additional compilation can be run.
 
@@ -102,23 +102,23 @@ ENDIF(MEDCOUPLING_BUILD_TESTS)
 IF(MEDCOUPLING_USE_MPI)
   FIND_PACKAGE(SalomeMPI REQUIRED)
   ADD_DEFINITIONS("-DHAVE_MPI")
-  IF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+  IF(MEDCOUPLING_PARTITIONER_PARMETIS)
     FIND_PACKAGE(SalomeParMetis)
-    SALOME_LOG_OPTIONAL_PACKAGE(ParMetis MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+    SALOME_LOG_OPTIONAL_PACKAGE(ParMetis MEDCOUPLING_PARTITIONER_PARMETIS)
     ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS")
-  ENDIF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+  ENDIF(MEDCOUPLING_PARTITIONER_PARMETIS)
 ENDIF(MEDCOUPLING_USE_MPI)
 
-IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+IF(MEDCOUPLING_ENABLE_RENUMBER)
   FIND_PACKAGE(SalomeBoost)
-  SALOME_LOG_OPTIONAL_PACKAGE(Boost MEDCOUPLING_MED_ENABLE_RENUMBER)
-ENDIF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+  SALOME_LOG_OPTIONAL_PACKAGE(Boost MEDCOUPLING_ENABLE_RENUMBER)
+ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
 
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   FIND_PACKAGE(SalomePython)
   FIND_PACKAGE(SalomeSWIG)
-  SALOME_LOG_OPTIONAL_PACKAGE(Python MEDCOUPLING_MED_ENABLE_PYTHON)
-  SALOME_LOG_OPTIONAL_PACKAGE(SWIG   MEDCOUPLING_MED_ENABLE_PYTHON)
+  SALOME_LOG_OPTIONAL_PACKAGE(Python MEDCOUPLING_ENABLE_PYTHON)
+  SALOME_LOG_OPTIONAL_PACKAGE(SWIG   MEDCOUPLING_ENABLE_PYTHON)
   # Set the extra flags for SWIG for numpy and scipy
   SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY)
   IF(NUMPY_FOUND)
@@ -127,7 +127,7 @@ IF(MEDCOUPLING_MED_ENABLE_PYTHON)
   IF(SCIPY_FOUND)
     SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "${SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY};-DWITH_SCIPY")
   ENDIF(SCIPY_FOUND)
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
 IF(MEDCOUPLING_BUILD_DOC)
   FIND_PACKAGE(SalomeDoxygen)
@@ -155,12 +155,12 @@ SET(MEDCOUPLING_INSTALL_TESTS tests CACHE PATH "Install path: MEDCoupling tests"
 SET(MEDCOUPLING_INSTALL_SCRIPT_PYTHON ${MEDCOUPLING_INSTALL_BINS} CACHE PATH "Install path: MEDCoupling Python scripts")
 SET(MEDCOUPLING_INSTALL_CMAKE_LOCAL cmake_files CACHE PATH "Install path: local MEDCoupling CMake files")
 
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
   SET(MEDCOUPLING_INSTALL_PYTHON ${_pydir} CACHE PATH "Install path: MEDCoupling Python stuff")
   SET(MEDCOUPLING_INSTALL_PYTHON_SHARED ${MEDCOUPLING_INSTALL_PYTHON}/shared_modules CACHE PATH
     "Install path: MEDCoupling Python shared modules")
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
 SET(MEDCOUPLING_INSTALL_RES share/resources CACHE PATH "Install path: MEDCoupling resources")
 SET(MEDCOUPLING_INSTALL_DOC share/doc CACHE PATH "Install path: MEDCoupling documentation")
@@ -168,12 +168,12 @@ SET(MEDCOUPLING_INSTALL_DOC share/doc CACHE PATH "Install path: MEDCoupling docu
 # Med specific:
 
 SET(MEDCOUPLING_INSTALL_RES_DATA "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCoupling specific data")
-#SET(MEDCOUPLING_MED_INSTALL_RES_SCRIPTS "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCouplng specific scripts")
+#SET(MEDCOUPLING_INSTALL_RES_SCRIPTS "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCouplng specific scripts")
 
 MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_BINS MEDCOUPLING_INSTALL_LIBS MEDCOUPLING_INSTALL_IDLS MEDCOUPLING_INSTALL_HEADERS)
 MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS MEDCOUPLING_INSTALL_SCRIPT_DATA MEDCOUPLING_INSTALL_SCRIPT_PYTHON)
 MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_APPLISKEL_SCRIPTS  MEDCOUPLING_INSTALL_APPLISKEL_PYTHON MEDCOUPLING_INSTALL_CMAKE MEDCOUPLING_INSTALL_CMAKE_LOCAL MEDCOUPLING_INSTALL_RES)
-MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_PYTHON MEDCOUPLING_INSTALL_PYTHON_SHARED MEDCOUPLING_MED_INSTALL_RES_DATA MEDCOUPLING_INSTALL_DOC)
+MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_PYTHON MEDCOUPLING_INSTALL_PYTHON_SHARED MEDCOUPLING_INSTALL_RES_DATA MEDCOUPLING_INSTALL_DOC)
 
 # Header configuration
 # ====================
@@ -200,11 +200,11 @@ IF(MEDCOUPLING_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF(MEDCOUPLING_BUILD_DOC)
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
-  IF(MEDCOUPLING_MED_WITH_FILE_EXAMPLES)
+IF(NOT MEDCOUPLING_MICROMED)
+  IF(MEDCOUPLING_WITH_FILE_EXAMPLES)
     ADD_SUBDIRECTORY(resources)
-  ENDIF(MEDCOUPLING_MED_WITH_FILE_EXAMPLES)
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+  ENDIF(MEDCOUPLING_WITH_FILE_EXAMPLES)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
 # Configuration export
 # ====================
@@ -215,12 +215,12 @@ INCLUDE(CMakePackageConfigHelpers)
 SET(_${PROJECT_NAME}_exposed_targets
    interpkernel medcoupling medcouplingremapper)
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets medloader)
-  IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+  IF(MEDCOUPLING_ENABLE_RENUMBER)
     LIST(APPEND _${PROJECT_NAME}_exposed_targets renumbercpp)
   ENDIF()
-  IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
     LIST(APPEND _${PROJECT_NAME}_exposed_targets medpartitionercpp)
     IF(MEDCOUPLING_BUILD_TESTS)
       LIST(APPEND _${PROJECT_NAME}_exposed_targets MEDPARTITIONERTest)
@@ -233,11 +233,11 @@ ENDIF()
 
 IF(MEDCOUPLING_USE_MPI)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedmem)
-  IF(NOT MEDCOUPLING_MED_MICROMED)
+  IF(NOT MEDCOUPLING_MICROMED)
     LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedloader)
   ENDIF()
   IF(MEDCOUPLING_BUILD_TESTS)
-    IF(NOT MEDCOUPLING_MED_MICROMED)
+    IF(NOT MEDCOUPLING_MICROMED)
       LIST(APPEND _${PROJECT_NAME}_exposed_targets ParaMEDMEMTest)
     ENDIF()
   ENDIF()

diff --git a/MEDCouplingConfig.cmake.in b/MEDCouplingConfig.cmake.in
index 1085e4a26b2b077401d97dfaf912b965ca536371..e3e69377ef66ec0cfd6aaa91b2b89f05f7572763 100644 (file)
--- a/MEDCouplingConfig.cmake.in
+++ b/MEDCouplingConfig.cmake.in
@@ -48,12 +48,12 @@ SET(MEDCOUPLING_DEFINITIONS)
 #### Now the specificities
 
 # Options exported by the package:
-SET(MEDCOUPLING_MED_MICROMED       @MEDCOUPLING_MED_MICROMED@)
-SET(MEDCOUPLING_MED_ENABLE_PYTHON  @MEDCOUPLING_MED_ENABLE_PYTHON@)
+SET(MEDCOUPLING_MICROMED       @MEDCOUPLING_MICROMED@)
+SET(MEDCOUPLING_ENABLE_PYTHON  @MEDCOUPLING_ENABLE_PYTHON@)
 SET(MEDCOUPLING_USE_MPI            @MEDCOUPLING_USE_MPI@)
-SET(MEDCOUPLING_MED_BUILD_DOC      @MEDCOUPLING_MED_BUILD_DOC@)
-SET(MEDCOUPLING_MED_BUILD_TESTS    @MEDCOUPLING_MED_BUILD_TESTS@)
-SET(MEDCOUPLING_MED_BUILD_GUI      @MEDCOUPLING_MED_BUILD_GUI@)
+SET(MEDCOUPLING_BUILD_DOC      @MEDCOUPLING_BUILD_DOC@)
+SET(MEDCOUPLING_BUILD_TESTS    @MEDCOUPLING_BUILD_TESTS@)
+SET(MEDCOUPLING_BUILD_GUI      @MEDCOUPLING_BUILD_GUI@)
 
 # Advanced options
 
@@ -61,7 +61,7 @@ SET(MEDCOUPLING_MED_BUILD_GUI      @MEDCOUPLING_MED_BUILD_GUI@)
 
 # Optional level 1 prerequisites:
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   SET_AND_CHECK(MEDFILE_ROOT_DIR_EXP "@PACKAGE_MEDFILE_ROOT_DIR@")
 ENDIF()
 
@@ -103,10 +103,10 @@ SET(MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS "@MEDCOUPLING_INSTALL_BINS@")
 SET(MEDCOUPLING_INSTALL_TESTS "@MEDCOUPLING_INSTALL_BINS@")
 SET(MEDCOUPLING_INSTALL_SCRIPT_PYTHON "@MEDCOUPLING_INSTALL_BINS@")
 SET(MEDCOUPLING_INSTALL_CMAKE_LOCAL "@MEDCOUPLING_INSTALL_BINS@")
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   SET(MEDCOUPLING_INSTALL_PYTHON "@MEDCOUPLING_INSTALL_BINS@")
   SET(MEDCOUPLING_INSTALL_PYTHON_SHARED "@MEDCOUPLING_INSTALL_BINS@")
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 SET(MEDCOUPLING_INSTALL_RES "@MEDCOUPLING_INSTALL_BINS@")
 SET(MEDCOUPLING_INSTALL_DOC "@MEDCOUPLING_INSTALL_BINS@")
 

diff --git a/doc/user/doxygen/CMakeLists.txt b/doc/user/doxygen/CMakeLists.txt
index 29fdf6bb90cb1e3e3714b0e454394cd118b678ee..d6ad99613ba02b25bc29242243dcac9830cda44f 100644 (file)
--- a/doc/user/doxygen/CMakeLists.txt
+++ b/doc/user/doxygen/CMakeLists.txt
@@ -21,7 +21,7 @@ SALOME_CONFIGURE_FILE(Doxyfile_med_user.in Doxyfile_med_user)
 SALOME_CONFIGURE_FILE(static/header.html.in static/header.html)
 
 
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   INCLUDE(doxy2swig/doxy2swig.cmake)
 
   FILE(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}/tmp/medcouplingexamples.in" input)
@@ -68,8 +68,8 @@ IF(MEDCOUPLING_MED_ENABLE_PYTHON)
   ADD_CUSTOM_TARGET(swig_ready)
   ADD_DEPENDENCIES(swig_ready usr_docs)
 
-  MEDCOUPLING_MED_SWIG_DOCSTRING_CONFIGURE(usr_docs swig_ready MEDCoupling)
-  MEDCOUPLING_MED_SWIG_DOCSTRING_CONFIGURE(usr_docs swig_ready MEDLoader)
+  MEDCOUPLING_SWIG_DOCSTRING_CONFIGURE(usr_docs swig_ready MEDCoupling)
+  MEDCOUPLING_SWIG_DOCSTRING_CONFIGURE(usr_docs swig_ready MEDLoader)
 
   SET(doxyfile_med_user ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile_med_user)
   FILE(STRINGS ${doxyfile_med_user} enabled_sections REGEX "ENABLED_SECTIONS")

diff --git a/doc/user/doxygen/doxfiles/appendix/install.dox b/doc/user/doxygen/doxfiles/appendix/install.dox
index eb89c964687ff010281f9b216fd5b88fc088be8e..77d81253c8446ca3e9424a13cce6470177b2613c 100644 (file)
--- a/doc/user/doxygen/doxfiles/appendix/install.dox
+++ b/doc/user/doxygen/doxfiles/appendix/install.dox
@@ -19,13 +19,13 @@ cmake -DCMAKE_BUILD_TYPE=<Mode> -DCMAKE_INSTALL_PREFIX=<MEDCOUPLING_INSTALL> <ME
 This will configure the library without splitting functionalities. The \ref parallel "parallel functionalities" will be compiled if an MPI version has been found.
 
 The following options can be useful to configure MEDCoupling :
-- \a -DMEDCOUPLING_MED_PARTITIONER_METIS=ON enables metis graph library in MEDPartitioner,
-- \a -DMEDCOUPLING_MED_PARTITIONER_PARMETIS=ON enables parmetis graph library in MEDPartitioner,
-- \a -DMEDCOUPLING_MED_PARTITIONER_SCOTCH=ON enables scotch graph library in MEDPartitioner,
-- \a -DMEDCOUPLING_MED_MICROMED=ON build MED with MED file dependancy,
-- \a -DMEDCOUPLING_MED_ENABLE_PYTHON=ON builds PYTHON bindings,
-- \a -DMEDCOUPLING_MED_ENABLE_PARTITIONER builds MEDPartitioner,
-- \a -DMEDCOUPLING_MED_ENABLE_RENUMBER builds Renumber,
+- \a -DMEDCOUPLING_PARTITIONER_METIS=ON enables metis graph library in MEDPartitioner,
+- \a -DMEDCOUPLING_PARTITIONER_PARMETIS=ON enables parmetis graph library in MEDPartitioner,
+- \a -DMEDCOUPLING_PARTITIONER_SCOTCH=ON enables scotch graph library in MEDPartitioner,
+- \a -DMEDCOUPLING_MICROMED=ON build MED with MED file dependancy,
+- \a -DMEDCOUPLING_ENABLE_PYTHON=ON builds PYTHON bindings,
+- \a -DMEDCOUPLING_ENABLE_PARTITIONER builds MEDPartitioner,
+- \a -DMEDCOUPLING_ENABLE_RENUMBER builds Renumber,
 - \a -DMEDCOUPLING_USE_MPI=ON uses MPI containers.
 
 According to set options and compilation environment, user may need to define some <prerequisite>_ROOT_DIR variables. For example if in SALOME environment:

diff --git a/doc/user/doxygen/doxy2swig/doxy2swig.cmake b/doc/user/doxygen/doxy2swig/doxy2swig.cmake
index 8faf1d0c59665c91d5b866bb61b61d7240809735..77cc0513e3437df0dfe3ac06d8e8719558fa2165 100644 (file)
--- a/doc/user/doxygen/doxy2swig/doxy2swig.cmake
+++ b/doc/user/doxygen/doxy2swig/doxy2swig.cmake
@@ -58,7 +58,7 @@ SET(_classes_MEDLoader
 ## \param[in] swig_main_file main SWIG file including the other generated SWIG files
 ## \param[out] swig_files list of generated SWIG files
 ##
-MACRO(MEDCOUPLING_MED_SWIG_DOCSTRING_GENERATE target_doc target_swig cls_list swig_main_file swig_files)
+MACRO(MEDCOUPLING_SWIG_DOCSTRING_GENERATE target_doc target_swig cls_list swig_main_file swig_files)
     # List of generated SWIG files (.i) for doc purposes only:
     SET(${swig_files})
     FOREACH(_cls IN LISTS ${cls_list})
@@ -88,7 +88,7 @@ MACRO(MEDCOUPLING_MED_SWIG_DOCSTRING_GENERATE target_doc target_swig cls_list sw
 
       LIST(APPEND ${swig_files} ${_swig_file_base})
     ENDFOREACH()
-ENDMACRO(MEDCOUPLING_MED_SWIG_DOCSTRING_GENERATE)
+ENDMACRO(MEDCOUPLING_SWIG_DOCSTRING_GENERATE)
 
 
 ##
@@ -99,14 +99,14 @@ ENDMACRO(MEDCOUPLING_MED_SWIG_DOCSTRING_GENERATE)
 ## \param[in] target_swig dummy target encompassing the final build of all SWIG files
 ## \param[in] root_name either 'MEDCoupling' or 'MEDLoader'
 ##
-MACRO(MEDCOUPLING_MED_SWIG_DOCSTRING_CONFIGURE target_doc target_swig root_name)
+MACRO(MEDCOUPLING_SWIG_DOCSTRING_CONFIGURE target_doc target_swig root_name)
     SET(_all_swig_docs)
     SET(_swig_include_set)
     SET(_in_file doxy2swig/${root_name}_doc.i.in)
     SET(_out_file ${PROJECT_BINARY_DIR}/doc/${root_name}_doc.i)
-    MEDCOUPLING_MED_SWIG_DOCSTRING_GENERATE(${target_doc} ${target_swig} _classes_${root_name} ${_out_file} _all_swig_docs)
+    MEDCOUPLING_SWIG_DOCSTRING_GENERATE(${target_doc} ${target_swig} _classes_${root_name} ${_out_file} _all_swig_docs)
     FOREACH(f IN LISTS _all_swig_docs)
         SET(_swig_include_set "${_swig_include_set}\n%include \"${f}\"")
     ENDFOREACH()
     CONFIGURE_FILE(${_in_file} ${_out_file} @ONLY)
-ENDMACRO(MEDCOUPLING_MED_SWIG_DOCSTRING_CONFIGURE)
+ENDMACRO(MEDCOUPLING_SWIG_DOCSTRING_CONFIGURE)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index acdf1c3011c739ad1b3b27a1b610e17786028ddf..62ef3fb7c08659123ff5df1c64d4126613b059e7 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -18,54 +18,54 @@
 # InterpKERNEL
 ADD_SUBDIRECTORY(INTERP_KERNEL)
 IF(MEDCOUPLING_BUILD_TESTS)
-  IF(NOT MEDCOUPLING_MED_MICROMED)  # to be fixed later: the tests depends on some MEDLoader includes!!
+  IF(NOT MEDCOUPLING_MICROMED)  # to be fixed later: the tests depends on some MEDLoader includes!!
      ADD_SUBDIRECTORY(INTERP_KERNELTest)
   ENDIF()
 ENDIF(MEDCOUPLING_BUILD_TESTS)
 
 # MEDCoupling
 ADD_SUBDIRECTORY(MEDCoupling)
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(MEDCoupling_Swig)
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   # MEDLoader
   ADD_SUBDIRECTORY(MEDLoader)
   
   # RENUMBER
-  IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+  IF(MEDCOUPLING_ENABLE_RENUMBER)
     ADD_SUBDIRECTORY(RENUMBER)
-    IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(RENUMBER_Swig)
-    ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
-  ENDIF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
   
   # MEDPartitioner
-  IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
     ADD_SUBDIRECTORY(MEDPartitioner)
-    IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(MEDPartitioner_Swig)
-    ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
-  ENDIF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
 IF(MEDCOUPLING_USE_MPI)
   # ParaMEDMEM
   ADD_SUBDIRECTORY(ParaMEDMEM)
   
   # ParaMEDLoader
-  IF(NOT MEDCOUPLING_MED_MICROMED)
+  IF(NOT MEDCOUPLING_MICROMED)
     ADD_SUBDIRECTORY(ParaMEDLoader)
-  ENDIF(NOT MEDCOUPLING_MED_MICROMED)
-  IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+  ENDIF(NOT MEDCOUPLING_MICROMED)
+  IF(MEDCOUPLING_ENABLE_PYTHON)
     ADD_SUBDIRECTORY(ParaMEDMEM_Swig)
-  ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_PYTHON)
   IF(MEDCOUPLING_BUILD_TESTS)
-    IF(NOT MEDCOUPLING_MED_MICROMED)
+    IF(NOT MEDCOUPLING_MICROMED)
       ADD_SUBDIRECTORY(ParaMEDMEMTest)
-    ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+    ENDIF(NOT MEDCOUPLING_MICROMED)
   ENDIF(MEDCOUPLING_BUILD_TESTS)
 ENDIF(MEDCOUPLING_USE_MPI)
 

diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt
index aa3a53b38b4c0fb33ec36fb1e9266091311449f5..ea16575f83e62b3b76ff10c19ab98d95d3825321 100644 (file)
--- a/src/INTERP_KERNELTest/CMakeLists.txt
+++ b/src/INTERP_KERNELTest/CMakeLists.txt
@@ -60,7 +60,7 @@ SET(PerfTest_SOURCES
   PerfTest.cxx
   )
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   SET(InterpKernelTest_SOURCES
     ${InterpKernelTest_SOURCES}
     InterpolationOptionsTest.cxx
@@ -73,14 +73,14 @@ IF(NOT MEDCOUPLING_MED_MICROMED)
   ADD_EXECUTABLE(PerfTest ${PerfTest_SOURCES})
   TARGET_LINK_LIBRARIES(PerfTest InterpKernelTest ${CPPUNIT_LIBRARIES} ${PLATFORM_LIBS})
   INSTALL(TARGETS PerfTest DESTINATION ${MEDCOUPLING_INSTALL_BINS})
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
 ADD_LIBRARY(InterpKernelTest SHARED ${InterpKernelTest_SOURCES})
 
 SET(InterpKernelTest_LIBS medcoupling interpkernel ${CPPUNIT_LIBRARIES})
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   SET(InterpKernelTest_LIBS medloader ${InterpKernelTest_LIBS})
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 TARGET_LINK_LIBRARIES(InterpKernelTest ${InterpKernelTest_LIBS})
 
 ADD_EXECUTABLE(TestINTERP_KERNEL ${TestINTERP_KERNEL_SOURCES})

diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt
index 3c4e10bfdfd1c310a7b4a1379b014d806b9a0f38..b2f6e8e1c5cda183f13c57b5569cb6e220bb7104 100644 (file)
--- a/src/MEDLoader/CMakeLists.txt
+++ b/src/MEDLoader/CMakeLists.txt
@@ -20,9 +20,9 @@
 
 ADD_DEFINITIONS(${HDF5_DEFINITIONS} ${MEDFILE_DEFINITIONS} ${XDR_DEFINITIONS})
 
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(Swig)
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
 IF(MEDCOUPLING_BUILD_TESTS)
   ADD_SUBDIRECTORY(Test)
@@ -32,11 +32,11 @@ SET(MEDLOADER_XDR_INCLUDE_DIRS)
 SET(MEDLOADER_XDR_LIBRARIES)
 
 IF(WIN32)
-  IF(MEDCOUPLING_MED_MEDLOADER_USE_XDR)
+  IF(MEDCOUPLING_MEDLOADER_USE_XDR)
     ADD_DEFINITIONS(-DNOMINMAX)
     SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
     SET(MEDLOADER_XDR_LIBRARIES ${XDR_LIBRARIES})
-  ENDIF(MEDCOUPLING_MED_MEDLOADER_USE_XDR)
+  ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR)
 ELSE(WIN32)
   SET(MEDLOADER_XDR_INCLUDE_DIRS ${XDR_INCLUDE_DIRS})
 ENDIF(WIN32)

diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt
index 2cfe13a79a7c8f9515fc2468b38666d0dbfc5467..b1803513c54dea47a0f7a6593968bc259783f2de 100644 (file)
--- a/src/MEDPartitioner/CMakeLists.txt
+++ b/src/MEDPartitioner/CMakeLists.txt
@@ -33,28 +33,28 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints
   )
 
-IF(MEDCOUPLING_MED_PARTITIONER_METIS)
+IF(MEDCOUPLING_PARTITIONER_METIS)
   ADD_DEFINITIONS(${METIS_DEFINITIONS})
   IF(MEDCOUPLING_METIS_V5)
     ADD_DEFINITIONS("-DMED_ENABLE_METIS_V5")
   ENDIF(MEDCOUPLING_METIS_V5)
   INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIRS})
-ENDIF(MEDCOUPLING_MED_PARTITIONER_METIS)
+ENDIF(MEDCOUPLING_PARTITIONER_METIS)
 
 
 ########
 # VERY IMPORTANT PUT METIS BEFORE SCOTCH because
 # metis.h is also in SCOTCH install dir !!!
 ########
-IF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
+IF(MEDCOUPLING_PARTITIONER_SCOTCH)
   ADD_DEFINITIONS(${SCOTCH_DEFINITIONS})
   INCLUDE_DIRECTORIES(${SCOTCH_INCLUDE_DIRS})
-ENDIF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
+ENDIF(MEDCOUPLING_PARTITIONER_SCOTCH)
 
-IF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+IF(MEDCOUPLING_PARTITIONER_PARMETIS)
   ADD_DEFINITIONS(${PARMETIS_DEFINITIONS})
   INCLUDE_DIRECTORIES(${PARMETIS_INCLUDE_DIRS})
-ENDIF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+ENDIF(MEDCOUPLING_PARTITIONER_PARMETIS)
 
 IF(MEDCOUPLING_USE_MPI)
   ADD_DEFINITIONS(${MPI_DEFINITIONS})
@@ -106,24 +106,24 @@ SET(medpartitionercpp_LDFLAGS
   medcoupling
   medloader
 )
-IF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+IF(MEDCOUPLING_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(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
-IF(MEDCOUPLING_MED_PARTITIONER_METIS)
+ENDIF(MEDCOUPLING_PARTITIONER_PARMETIS)
+IF(MEDCOUPLING_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(MEDCOUPLING_MED_PARTITIONER_METIS)
-IF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
+ENDIF(MEDCOUPLING_PARTITIONER_METIS)
+IF(MEDCOUPLING_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(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
+ENDIF(MEDCOUPLING_PARTITIONER_SCOTCH)
 
 IF(${MEDCOUPLING_USE_MPI})
   SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_UtilsPara.cxx MEDPARTITIONER_JointFinder.cxx)

diff --git a/src/MEDPartitioner/Test/CMakeLists.txt b/src/MEDPartitioner/Test/CMakeLists.txt
index 439d59d0066acb413ff87b3175862bc48e1b6377..e20f333481ce90651674112eee5e1b818d0b3ba0 100644 (file)
--- a/src/MEDPartitioner/Test/CMakeLists.txt
+++ b/src/MEDPartitioner/Test/CMakeLists.txt
@@ -36,9 +36,9 @@ SET(MEDPARTITIONERTest_SOURCES
 SET(MEDPARTITIONERTest_LDFLAGS medpartitionercpp ${CPPUNIT_LIBRARIES})
 
 IF(MEDCOUPLING_USE_MPI)
-  IF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+  IF(MEDCOUPLING_PARTITIONER_PARMETIS)
     SET(MEDPARTITIONERTest_SOURCES ${MEDPARTITIONERTest_SOURCES} MEDPARTITIONERTestPara.cxx)
-  ENDIF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+  ENDIF(MEDCOUPLING_PARTITIONER_PARMETIS)
 ENDIF(MEDCOUPLING_USE_MPI)
 
 ADD_LIBRARY(MEDPARTITIONERTest SHARED ${MEDPARTITIONERTest_SOURCES})

diff --git a/src/MEDPartitioner_Swig/CMakeLists.txt b/src/MEDPartitioner_Swig/CMakeLists.txt
index eaba97a07c432fdf27fb6aaf3d5d0e897d0237d0..5a715efc951b7c5b07d7d725d5fdf03919bd1be4 100644 (file)
--- a/src/MEDPartitioner_Swig/CMakeLists.txt
+++ b/src/MEDPartitioner_Swig/CMakeLists.txt
@@ -61,7 +61,7 @@ SALOME_INSTALL_SCRIPTS("${PYFILES_TO_INSTALL}" ${MEDCOUPLING_INSTALL_SCRIPT_PYTH
 INSTALL(FILES MEDPartitioner.i MEDPartitionerCommon.i DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
 INSTALL(FILES MEDPartitionerTest.py DESTINATION ${MEDCOUPLING_INSTALL_SCRIPT_PYTHON})
 
-IF(MEDCOUPLING_MED_PARTITIONER_METIS)
+IF(MEDCOUPLING_PARTITIONER_METIS)
    # Python test of partitionner require METIS or PARMETIS?
    SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env)
    ADD_TEST(MEDPartitionerTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDPartitionerTest.py)