Merge remote branch 'origin/abn/icoco_fix' into V7_5_BR

[tools/medcoupling.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a01e295c27667ba4c240c510c23bd716bd794444..d261cdb273d47fbeb0962820b6db8fa546e4213b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # 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,7 +17,6 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-#TODO MEDPartitioner & RENUMBER
 ADD_SUBDIRECTORY(INTERP_KERNEL)
 ADD_SUBDIRECTORY(MEDCoupling)
 
@@ -27,7 +26,12 @@ ENDIF(SALOME_MED_ENABLE_PYTHON)
 
 IF(NOT SALOME_MED_MICROMED)
   ADD_SUBDIRECTORY(MEDLoader)
-  ADD_SUBDIRECTORY(RENUMBER)
+  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)
@@ -57,19 +61,19 @@ ENDIF(SALOME_USE_MPI)
 
 IF(NOT SALOME_MED_STANDALONE)
   ADD_SUBDIRECTORY(MEDCouplingCorba)
-  ADD_SUBDIRECTORY(MEDCalculator)
+  IF(NOT SALOME_MED_MICROMED)
+    ADD_SUBDIRECTORY(MEDCalculator)
+    ADD_SUBDIRECTORY(MEDOP)
+  ENDIF(NOT SALOME_MED_MICROMED)
   IF(SALOME_MED_ENABLE_PYTHON)
     ADD_SUBDIRECTORY(MEDCouplingCorba_Swig)
   ENDIF(SALOME_MED_ENABLE_PYTHON)
 ENDIF(NOT SALOME_MED_STANDALONE)
 
 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)
+  IF(NOT SALOME_MED_MICROMED)
+    IF(SALOME_MED_ENABLE_PYTHON)
+      #ADD_SUBDIRECTORY(MEDGUI)
+    ENDIF(SALOME_MED_ENABLE_PYTHON)
+  ENDIF(NOT SALOME_MED_MICROMED)
 ENDIF(SALOME_BUILD_GUI)