X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=2489e0a02bf649df77c6647ceebbc3963586775f;hb=71e13967fdd8dfee45f72204338550eba169724f;hp=5ef02c6bc88cc27ad807bc440222e2232a28b242;hpb=c24deb497d70cc2fef718b507a17e370918abadc;p=modules%2Fmed.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5ef02c6bc..2489e0a02 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# 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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,77 +17,20 @@
 # 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)
-
-# INTERP_KERNELTest, MED, RENUMBER and MEDGUI will go from OLD_COMMON_SUBDIRS -> COMMON_SUBDIRS for Salome7
-
-IF(SWIG_STATUS)
-  SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDCoupling_Swig)
-ENDIF(SWIG_STATUS)
-
-IF(MED_ENABLE_MED3)
-  SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDLoader MEDWrapper)
-  SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS})
-  IF(CPPUNIT_IS_OK)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} INTERP_KERNELTest )
-  ENDIF(CPPUNIT_IS_OK)
-  IF(SWIG_STATUS)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS})
-  ENDIF(SWIG_STATUS)
-ENDIF(MED_ENABLE_MED3)
-
-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(MED_ENABLE_SPLITTER)
-  IF(MED_ENABLE_MED3)
-    SET(COMMON_SUBDIRS ${COMMON_SUBDIRS} MEDPartitioner)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS})
-    IF(SWIG_STATUS)
-      SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS})
-    ENDIF(SWIG_STATUS)
-  ENDIF(MED_ENABLE_MED3)
-ENDIF(MED_ENABLE_SPLITTER)
-
-IF(MED_ENABLE_RENUMBER)
-  IF(MED_ENABLE_MED3)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS} RENUMBER)
-  ENDIF(MED_ENABLE_MED3)
-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})
-  ENDIF(SWIG_STATUS)
-  SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS})
-  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 MEDOP)
-    SET(OLD_COMMON_SUBDIRS ${OLD_COMMON_SUBDIRS})
-  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_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(MEDCouplingCorba_Swig)
+ENDIF(SALOME_MED_ENABLE_PYTHON)
+
+IF(SALOME_BUILD_GUI)
+  IF(SALOME_MED_ENABLE_PYTHON)
+    #ADD_SUBDIRECTORY(MEDGUI)
+  ENDIF(SALOME_MED_ENABLE_PYTHON)
+ENDIF(SALOME_BUILD_GUI)