X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FCMakeLists.txt;h=834518d3fd966b4dd33f6c30e980589e98770be7;hb=c8dc401a83f86ecc28681bda2f540528f64cc79a;hp=a041dbf109455de494342cb61530139f7a1310cd;hpb=10f37bf6f33a762626d7f1093b2f5450c1688667;p=tools%2Fmedcoupling.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a041dbf10..834518d3f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2012  CEA/DEN, EDF R&D
+# 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
@@ -17,73 +17,59 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-SET(COMMON_SUBDIRS INTERP_KERNEL MEDCoupling)
-SET(PARAMEDMEM_SUBDIRS)
-SET(OLD_COMMON_SUBDIRS)
+#TODO MEDPartitioner & RENUMBER
+ADD_SUBDIRECTORY(INTERP_KERNEL)
+ADD_SUBDIRECTORY(MEDCoupling)
 
-# INTERP_KERNELTest, MED, RENUMBER and MEDGUI will go from OLD_COMMON_SUBDIRS -> COMMON_SUBDIRS for Salome7
+IF(SALOME_MED_ENABLE_PYTHON)
+  ADD_SUBDIRECTORY(MEDCoupling_Swig)
+ENDIF(SALOME_MED_ENABLE_PYTHON)
 
-IF(SWIG_STATUS)
-  SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDCoupling_Swig)
-ENDIF(SWIG_STATUS)
+IF(NOT SALOME_MED_MICROMED)
+  ADD_SUBDIRECTORY(MEDLoader)
+  ADD_SUBDIRECTORY(RENUMBER)
+  IF(SALOME_MED_ENABLE_PARTITIONER)
+    ADD_SUBDIRECTORY(MEDPartitioner)
+  ENDIF(SALOME_MED_ENABLE_PARTITIONER)
+  IF(SALOME_BUILD_TESTS)
+    ADD_SUBDIRECTORY(INTERP_KERNELTest)
+  ENDIF(SALOME_BUILD_TESTS)
+ENDIF(NOT SALOME_MED_MICROMED)
 
-IF(MED_ENABLE_MED3)
-  SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDLoader MEDWrapper)
-  SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MEDMEM)
-  IF(CPPUNIT_IS_OK)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} INTERP_KERNELTest MEDMEMBinTest MEDMEMCppTest)
-  ENDIF(CPPUNIT_IS_OK)
-  IF(SWIG_STATUS)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MEDMEM_SWIG)
-  ENDIF(SWIG_STATUS)
-ENDIF(MED_ENABLE_MED3)
+IF(SALOME_USE_MPI)
+  ADD_SUBDIRECTORY(ParaMEDMEM)
+  IF(NOT SALOME_MED_MICROMED)
+    ADD_SUBDIRECTORY(ParaMEDLoader)
+  ENDIF(NOT SALOME_MED_MICROMED)
+  IF(NOT SALOME_MED_STANDALONE)
+    ADD_SUBDIRECTORY(ParaMEDCouplingCorba)
+    ADD_SUBDIRECTORY(ParaMEDMEMComponent)
+  ENDIF(NOT SALOME_MED_STANDALONE)
+  IF(SALOME_MED_ENABLE_PYTHON)
+    ADD_SUBDIRECTORY(ParaMEDMEM_Swig)
+  ENDIF(SALOME_MED_ENABLE_PYTHON)
+  IF(SALOME_BUILD_TESTS)
+    IF(NOT SALOME_MED_MICROMED)
+      ADD_SUBDIRECTORY(ParaMEDMEMTest)
+    ENDIF(NOT SALOME_MED_MICROMED)
+  ENDIF(SALOME_BUILD_TESTS)
+ENDIF(SALOME_USE_MPI)
 
-IF(MPI_IS_OK)
-  SET(PARAMEDMEM_SUBDIRS ${PARAMEDMEM_SUBDIRS} ParaMEDMEM)
-  IF(MED_ENABLE_MED3)
-    SET(PARAMEDMEM_SUBDIRS ${PARAMEDMEM_SUBDIRS} ParaMEDLoader)
-    IF(CPPUNIT_IS_OK)
-      SET(PARAMEDMEM_SUBDIRS ${PARAMEDMEM_SUBDIRS} ParaMEDMEMTest)
-    ENDIF(CPPUNIT_IS_OK)
-    IF(SWIG_STATUS)
-      SET(PARAMEDMEM_SUBDIRS ${PARAMEDMEM_SUBDIRS} ParaMEDMEM_Swig)
-    ENDIF(SWIG_STATUS)
-  ENDIF(MED_ENABLE_MED3)
-ENDIF(MPI_IS_OK)
+IF(NOT SALOME_MED_STANDALONE)
+  ADD_SUBDIRECTORY(MEDCouplingCorba)
+  ADD_SUBDIRECTORY(MEDCalculator)
+  IF(SALOME_MED_ENABLE_PYTHON)
+    ADD_SUBDIRECTORY(MEDCouplingCorba_Swig)
+  ENDIF(SALOME_MED_ENABLE_PYTHON)
+ENDIF(NOT SALOME_MED_STANDALONE)
 
-IF(MED_ENABLE_SPLITTER)
-  SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDPartitioner)
-  SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MEDSPLITTER)
-  IF(SWIG_STATUS)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MEDSPLITTER_Swig)
-  ENDIF(SWIG_STATUS)
-ENDIF(MED_ENABLE_SPLITTER)
-
-IF(MED_ENABLE_RENUMBER)
-  SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} RENUMBER)
-ENDIF(MED_ENABLE_RENUMBER)
-
-IF(MED_ENABLE_KERNEL)
-  SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDCouplingCorba)
-  IF(SWIG_STATUS)
-    SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDCouplingCorba_Swig)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MedCorba_Swig MED_SWIG)
-  ENDIF(SWIG_STATUS)
-  SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MED MedClient)
-  IF(MPI_IS_OK)
-    SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} ParaMEDCouplingCorba ParaMEDMEMComponent)
-  ENDIF(MPI_IS_OK)
-  IF(MED_ENABLE_MED3)
-    SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDCalculator)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MEDMEM_I)
-  ENDIF(MED_ENABLE_MED3)
-  IF(MED_ENABLE_GUI)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} MEDGUI)
-  ENDIF(MED_ENABLE_GUI)
-ENDIF(MED_ENABLE_KERNEL)
-
-SET(SUBDIRS ${COMMON_SUBDIRS} ${PARAMEDMEM_SUBDIRS} ${OLD_COMMON_SUBDIRS})
-
-FOREACH(DIR ${SUBDIRS})
-  ADD_SUBDIRECTORY(${DIR})
-ENDFOREACH(DIR ${SUBDIRS})
+IF(SALOME_BUILD_GUI)
+  IF(NOT SALOME_MED_STANDALONE)
+    IF(NOT SALOME_MED_MICROMED)
+      IF(SALOME_MED_ENABLE_PYTHON)
+	ADD_SUBDIRECTORY(MEDGUI)
+	ADD_SUBDIRECTORY(MEDOP)
+      ENDIF(SALOME_MED_ENABLE_PYTHON)
+    ENDIF(NOT SALOME_MED_MICROMED)
+  ENDIF(NOT SALOME_MED_STANDALONE)
+ENDIF(SALOME_BUILD_GUI)