Merge branch 'agr/medcoupling_tool'

[modules/med.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6ec53358d4c2fe3945d4825d313de42627ee7dc8..2489e0a02bf649df77c6647ceebbc3963586775f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2012-2015  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,63 +17,20 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-ADD_SUBDIRECTORY(INTERP_KERNEL)
-ADD_SUBDIRECTORY(MEDCoupling)
+IF(SALOME_USE_MPI)
+  ADD_SUBDIRECTORY(ParaMEDCouplingCorba)
+  ADD_SUBDIRECTORY(ParaMEDMEMComponent)
+ENDIF(SALOME_USE_MPI)
 
+ADD_SUBDIRECTORY(MEDCouplingCorba)
+ADD_SUBDIRECTORY(MEDCalculator)
+ADD_SUBDIRECTORY(MEDCalc)
 IF(SALOME_MED_ENABLE_PYTHON)
-  ADD_SUBDIRECTORY(MEDCoupling_Swig)
+  ADD_SUBDIRECTORY(MEDCouplingCorba_Swig)
 ENDIF(SALOME_MED_ENABLE_PYTHON)
 
-IF(NOT SALOME_MED_MICROMED)
-  ADD_SUBDIRECTORY(MEDLoader)
-  IF(SALOME_MED_ENABLE_RENUMBER)
-    ADD_SUBDIRECTORY(RENUMBER)
-    IF(SALOME_MED_ENABLE_PYTHON)
-      ADD_SUBDIRECTORY(RENUMBER_Swig)
-    ENDIF(SALOME_MED_ENABLE_PYTHON)
-  ENDIF(SALOME_MED_ENABLE_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(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(NOT SALOME_MED_STANDALONE)
-  ADD_SUBDIRECTORY(MEDCouplingCorba)
-  IF(NOT SALOME_MED_MICROMED)
-    ADD_SUBDIRECTORY(MEDCalculator)
-  ENDIF(NOT SALOME_MED_MICROMED)
+IF(SALOME_BUILD_GUI)
   IF(SALOME_MED_ENABLE_PYTHON)
-    ADD_SUBDIRECTORY(MEDCouplingCorba_Swig)
+    #ADD_SUBDIRECTORY(MEDGUI)
   ENDIF(SALOME_MED_ENABLE_PYTHON)
-ENDIF(NOT SALOME_MED_STANDALONE)
-
-IF(SALOME_BUILD_GUI)
-  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(SALOME_BUILD_GUI)