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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c360b4a7c..1aafde666 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,46 +15,54 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 
-SET(MED_ENABLE_MICROMED ${MEDCOUPLING_MED_MICROMED})
-
+# InterpKERNEL
 ADD_SUBDIRECTORY(INTERP_KERNEL)
 IF(MEDCOUPLING_BUILD_TESTS)
   ADD_SUBDIRECTORY(INTERP_KERNELTest)
 ENDIF(MEDCOUPLING_BUILD_TESTS)
-ADD_SUBDIRECTORY(MEDCoupling)
 
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+# MEDCoupling
+ADD_SUBDIRECTORY(MEDCoupling)
+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)
-  IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+  
+  # 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)
-  IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
+  
+  # MEDPartitioner
+  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)
-  IF(NOT MEDCOUPLING_MED_MICROMED)
+  
+  # ParaMEDLoader
+  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)