X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=1aafde666fad61e2107c1b6b1deb9adea74e4e87;hb=1e36a6710aab710674e20fbd89f6a9a8f238c023;hp=725c1e0db4cee2b68d138c4cd765ef2d577d55a2;hpb=efda4aa0f0b010d87058479d926ee870c43bc32b;p=tools%2Fmedcoupling.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 725c1e0db..1aafde666 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,54 +15,62 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 
-SET(MED_ENABLE_MICROMED ${SALOME_MED_MICROMED})
-
+# InterpKERNEL
 ADD_SUBDIRECTORY(INTERP_KERNEL)
-IF(SALOME_BUILD_TESTS)
+IF(MEDCOUPLING_BUILD_TESTS)
   ADD_SUBDIRECTORY(INTERP_KERNELTest)
-ENDIF(SALOME_BUILD_TESTS)
-ADD_SUBDIRECTORY(MEDCoupling)
+ENDIF(MEDCOUPLING_BUILD_TESTS)
 
-IF(SALOME_MED_ENABLE_PYTHON)
+# MEDCoupling
+ADD_SUBDIRECTORY(MEDCoupling)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(MEDCoupling_Swig)
-ENDIF(SALOME_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
-IF(NOT SALOME_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
+  # MEDLoader
   ADD_SUBDIRECTORY(MEDLoader)
-  IF(SALOME_MED_ENABLE_RENUMBER)
+  
+  # RENUMBER
+  IF(MEDCOUPLING_ENABLE_RENUMBER)
     ADD_SUBDIRECTORY(RENUMBER)
-    IF(SALOME_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(RENUMBER_Swig)
-    ENDIF(SALOME_MED_ENABLE_PYTHON)
-  ENDIF(SALOME_MED_ENABLE_RENUMBER)
-  IF(SALOME_MED_ENABLE_PARTITIONER)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
+  
+  # MEDPartitioner
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
     ADD_SUBDIRECTORY(MEDPartitioner)
-    IF(SALOME_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(MEDPartitioner_Swig)
-    ENDIF(SALOME_MED_ENABLE_PYTHON)
-  ENDIF(SALOME_MED_ENABLE_PARTITIONER)
-ENDIF(NOT SALOME_MED_MICROMED)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
-IF(SALOME_USE_MPI)
+IF(MEDCOUPLING_USE_MPI)
+  # ParaMEDMEM
   ADD_SUBDIRECTORY(ParaMEDMEM)
-  IF(NOT SALOME_MED_MICROMED)
+  
+  # ParaMEDLoader
+  IF(NOT MEDCOUPLING_MICROMED)
     ADD_SUBDIRECTORY(ParaMEDLoader)
-  ENDIF(NOT SALOME_MED_MICROMED)
-  IF(SALOME_MED_ENABLE_PYTHON)
+  ENDIF(NOT MEDCOUPLING_MICROMED)
+  IF(MEDCOUPLING_ENABLE_PYTHON)
     ADD_SUBDIRECTORY(ParaMEDMEM_Swig)
-  ENDIF(SALOME_MED_ENABLE_PYTHON)
-  IF(SALOME_BUILD_TESTS)
-    IF(NOT SALOME_MED_MICROMED)
+  ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  IF(MEDCOUPLING_BUILD_TESTS)
+    IF(NOT MEDCOUPLING_MICROMED)
       ADD_SUBDIRECTORY(ParaMEDMEMTest)
-    ENDIF(NOT SALOME_MED_MICROMED)
-  ENDIF(SALOME_BUILD_TESTS)
-ENDIF(SALOME_USE_MPI)
+    ENDIF(NOT MEDCOUPLING_MICROMED)
+  ENDIF(MEDCOUPLING_BUILD_TESTS)
+ENDIF(MEDCOUPLING_USE_MPI)
 
 # Application tests
 INSTALL(FILES CTestTestfileInstall.cmake
-  DESTINATION ${MEDTOOL_INSTALL_TESTS}
+  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}
   RENAME CTestTestfile.cmake)
 
 INSTALL(FILES CTestTestfileInstallMEDCoupling.cmake
-  DESTINATION ${MEDTOOL_INSTALL_TESTS}/MEDCoupling
+  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling
   RENAME CTestTestfile.cmake)