X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=d4b67e82f2271c0738899d49d260503b11cec421;hb=f100fdf8977ff06ab097b9a1d1400a26b16aebb9;hp=614d48eefd192951340a72fb59732fd9a33f98b7;hpb=fcc88f008be873d54bd6d06fbb39def48d3ab414;p=tools%2Fmedcoupling.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 614d48eef..d4b67e82f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015-2016  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,75 +17,59 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+# InterpKERNEL
 ADD_SUBDIRECTORY(INTERP_KERNEL)
-ADD_SUBDIRECTORY(MEDCoupling)
+IF(MEDCOUPLING_BUILD_TESTS)
+  ADD_SUBDIRECTORY(INTERP_KERNELTest)
+ENDIF(MEDCOUPLING_BUILD_TESTS)
 
-IF(SALOME_MED_ENABLE_PYTHON)
+# MEDCoupling
+ADD_SUBDIRECTORY(MEDCoupling)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(MEDCoupling_Swig)
-ENDIF(SALOME_MED_ENABLE_PYTHON)
+  ADD_SUBDIRECTORY(PyWrapping)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
-IF(NOT SALOME_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
+  # MEDLoader
   ADD_SUBDIRECTORY(MEDLoader)
-  IF(SALOME_MED_ENABLE_RENUMBER)
+
+  # RENUMBER
+  IF(MEDCOUPLING_ENABLE_RENUMBER)
     ADD_SUBDIRECTORY(RENUMBER)
-    IF(SALOME_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(RENUMBER_Swig)
-    ENDIF(SALOME_MED_ENABLE_PYTHON)
-  ENDIF(SALOME_MED_ENABLE_RENUMBER)
-  IF(SALOME_MED_ENABLE_PARTITIONER)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
+
+  # MEDPartitioner
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
     ADD_SUBDIRECTORY(MEDPartitioner)
-    IF(SALOME_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(MEDPartitioner_Swig)
-    ENDIF(SALOME_MED_ENABLE_PYTHON)
-  ENDIF(SALOME_MED_ENABLE_PARTITIONER)
-  IF(SALOME_BUILD_TESTS)
-    ADD_SUBDIRECTORY(INTERP_KERNELTest)
-  ENDIF(SALOME_BUILD_TESTS)
-ENDIF(NOT SALOME_MED_MICROMED)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
-IF(SALOME_USE_MPI)
+IF(MEDCOUPLING_USE_MPI)
+  # ParaMEDMEM
   ADD_SUBDIRECTORY(ParaMEDMEM)
-  IF(NOT SALOME_MED_MICROMED)
+
+  # ParaMEDLoader
+  IF(NOT MEDCOUPLING_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)
+  ENDIF(NOT MEDCOUPLING_MICROMED)
+  IF(MEDCOUPLING_ENABLE_PYTHON)
     ADD_SUBDIRECTORY(ParaMEDMEM_Swig)
-  ENDIF(SALOME_MED_ENABLE_PYTHON)
-  IF(SALOME_BUILD_TESTS)
-    IF(NOT SALOME_MED_MICROMED)
+  ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  IF(MEDCOUPLING_BUILD_TESTS)
+    IF(NOT MEDCOUPLING_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)
-    ADD_SUBDIRECTORY(MEDCalc)
-  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_MICROMED)
-    IF(SALOME_MED_ENABLE_PYTHON)
-      #ADD_SUBDIRECTORY(MEDGUI)
-    ENDIF(SALOME_MED_ENABLE_PYTHON)
-  ENDIF(NOT SALOME_MED_MICROMED)
-ENDIF(SALOME_BUILD_GUI)
+    ENDIF(NOT MEDCOUPLING_MICROMED)
+  ENDIF(MEDCOUPLING_BUILD_TESTS)
+ENDIF(MEDCOUPLING_USE_MPI)
 
 # Application tests
 INSTALL(FILES CTestTestfileInstall.cmake
-  DESTINATION ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test
-  RENAME CTestTestfile.cmake)
-
-INSTALL(FILES CTestTestfileInstallMEDCoupling.cmake
-  DESTINATION ${SALOME_INSTALL_SCRIPT_SCRIPTS}/test/MEDCoupling
+  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}
   RENAME CTestTestfile.cmake)