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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 834518d3f..1aafde666 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# Copyright (C) 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
@@ -14,62 +14,63 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
-#TODO MEDPartitioner & RENUMBER
+# 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)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
-IF(NOT SALOME_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
+  # MEDLoader
   ADD_SUBDIRECTORY(MEDLoader)
-  ADD_SUBDIRECTORY(RENUMBER)
-  IF(SALOME_MED_ENABLE_PARTITIONER)
+  
+  # RENUMBER
+  IF(MEDCOUPLING_ENABLE_RENUMBER)
+    ADD_SUBDIRECTORY(RENUMBER)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
+      ADD_SUBDIRECTORY(RENUMBER_Swig)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
+  
+  # MEDPartitioner
+  IF(MEDCOUPLING_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(MEDCOUPLING_ENABLE_PYTHON)
+      ADD_SUBDIRECTORY(MEDPartitioner_Swig)
+    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)
+    ENDIF(NOT MEDCOUPLING_MICROMED)
+  ENDIF(MEDCOUPLING_BUILD_TESTS)
+ENDIF(MEDCOUPLING_USE_MPI)
 
-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)
+# Application tests
+INSTALL(FILES CTestTestfileInstall.cmake
+  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}
+  RENAME CTestTestfile.cmake)
 
-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)
+INSTALL(FILES CTestTestfileInstallMEDCoupling.cmake
+  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling
+  RENAME CTestTestfile.cmake)