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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7065864f5..d4b67e82f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 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
@@ -14,55 +14,62 @@
 # 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
+#
 
-SET(MED_ENABLE_MICROMED ${MEDTOOL_MED_MICROMED})
-
+# InterpKERNEL
 ADD_SUBDIRECTORY(INTERP_KERNEL)
-IF(MEDTOOL_BUILD_TESTS)
+IF(MEDCOUPLING_BUILD_TESTS)
   ADD_SUBDIRECTORY(INTERP_KERNELTest)
-ENDIF(MEDTOOL_BUILD_TESTS)
-ADD_SUBDIRECTORY(MEDCoupling)
+ENDIF(MEDCOUPLING_BUILD_TESTS)
 
-IF(MEDTOOL_MED_ENABLE_PYTHON)
+# MEDCoupling
+ADD_SUBDIRECTORY(MEDCoupling)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(MEDCoupling_Swig)
-ENDIF(MEDTOOL_MED_ENABLE_PYTHON)
+  ADD_SUBDIRECTORY(PyWrapping)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
-IF(NOT MEDTOOL_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
+  # MEDLoader
   ADD_SUBDIRECTORY(MEDLoader)
-  IF(MEDTOOL_MED_ENABLE_RENUMBER)
+
+  # RENUMBER
+  IF(MEDCOUPLING_ENABLE_RENUMBER)
     ADD_SUBDIRECTORY(RENUMBER)
-    IF(MEDTOOL_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(RENUMBER_Swig)
-    ENDIF(MEDTOOL_MED_ENABLE_PYTHON)
-  ENDIF(MEDTOOL_MED_ENABLE_RENUMBER)
-  IF(MEDTOOL_MED_ENABLE_PARTITIONER)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
+
+  # MEDPartitioner
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
     ADD_SUBDIRECTORY(MEDPartitioner)
-    IF(MEDTOOL_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(MEDPartitioner_Swig)
-    ENDIF(MEDTOOL_MED_ENABLE_PYTHON)
-  ENDIF(MEDTOOL_MED_ENABLE_PARTITIONER)
-ENDIF(NOT MEDTOOL_MED_MICROMED)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
-IF(MEDTOOL_USE_MPI)
+IF(MEDCOUPLING_USE_MPI)
+  # ParaMEDMEM
   ADD_SUBDIRECTORY(ParaMEDMEM)
-  IF(NOT MEDTOOL_MED_MICROMED)
+
+  # ParaMEDLoader
+  IF(NOT MEDCOUPLING_MICROMED)
     ADD_SUBDIRECTORY(ParaMEDLoader)
-  ENDIF(NOT MEDTOOL_MED_MICROMED)
-  IF(MEDTOOL_MED_ENABLE_PYTHON)
+  ENDIF(NOT MEDCOUPLING_MICROMED)
+  IF(MEDCOUPLING_ENABLE_PYTHON)
     ADD_SUBDIRECTORY(ParaMEDMEM_Swig)
-  ENDIF(MEDTOOL_MED_ENABLE_PYTHON)
-  IF(MEDTOOL_BUILD_TESTS)
-    IF(NOT MEDTOOL_MED_MICROMED)
+  ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  IF(MEDCOUPLING_BUILD_TESTS)
+    IF(NOT MEDCOUPLING_MICROMED)
       ADD_SUBDIRECTORY(ParaMEDMEMTest)
-    ENDIF(NOT MEDTOOL_MED_MICROMED)
-  ENDIF(MEDTOOL_BUILD_TESTS)
-ENDIF(MEDTOOL_USE_MPI)
+    ENDIF(NOT MEDCOUPLING_MICROMED)
+  ENDIF(MEDCOUPLING_BUILD_TESTS)
+ENDIF(MEDCOUPLING_USE_MPI)
 
 # Application tests
 INSTALL(FILES CTestTestfileInstall.cmake
-  DESTINATION ${MEDTOOL_INSTALL_TESTS}
-  RENAME CTestTestfile.cmake)
-
-INSTALL(FILES CTestTestfileInstallMEDCoupling.cmake
-  DESTINATION ${MEDTOOL_INSTALL_TESTS}/MEDCoupling
+  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}
   RENAME CTestTestfile.cmake)