X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=0707aedc06d4e84828a6377b844dd297638e8e37;hb=5dcce0b37dfa04dac8c55b9016728be8f606ac4a;hp=acdf1c3011c739ad1b3b27a1b610e17786028ddf;hpb=a647d17ef9e201c9fe08e9ebaf165dd7e22697b7;p=tools%2Fmedcoupling.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index acdf1c301..0707aedc0 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,58 +14,57 @@
 # 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
+#
 
 # InterpKERNEL
 ADD_SUBDIRECTORY(INTERP_KERNEL)
 IF(MEDCOUPLING_BUILD_TESTS)
-  IF(NOT MEDCOUPLING_MED_MICROMED)  # to be fixed later: the tests depends on some MEDLoader includes!!
-     ADD_SUBDIRECTORY(INTERP_KERNELTest)
-  ENDIF()
+  ADD_SUBDIRECTORY(INTERP_KERNELTest)
 ENDIF(MEDCOUPLING_BUILD_TESTS)
 
 # MEDCoupling
 ADD_SUBDIRECTORY(MEDCoupling)
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(MEDCoupling_Swig)
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
-
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   # MEDLoader
   ADD_SUBDIRECTORY(MEDLoader)
-  
+
   # RENUMBER
-  IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+  IF(MEDCOUPLING_ENABLE_RENUMBER)
     ADD_SUBDIRECTORY(RENUMBER)
-    IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(RENUMBER_Swig)
-    ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
-  ENDIF(MEDCOUPLING_MED_ENABLE_RENUMBER)
-  
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
+
   # MEDPartitioner
-  IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
     ADD_SUBDIRECTORY(MEDPartitioner)
-    IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+    IF(MEDCOUPLING_ENABLE_PYTHON)
       ADD_SUBDIRECTORY(MEDPartitioner_Swig)
-    ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
-  ENDIF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+    ENDIF(MEDCOUPLING_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
 IF(MEDCOUPLING_USE_MPI)
   # ParaMEDMEM
   ADD_SUBDIRECTORY(ParaMEDMEM)
-  
+
   # ParaMEDLoader
-  IF(NOT MEDCOUPLING_MED_MICROMED)
+  IF(NOT MEDCOUPLING_MICROMED)
     ADD_SUBDIRECTORY(ParaMEDLoader)
-  ENDIF(NOT MEDCOUPLING_MED_MICROMED)
-  IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+  ENDIF(NOT MEDCOUPLING_MICROMED)
+  IF(MEDCOUPLING_ENABLE_PYTHON)
     ADD_SUBDIRECTORY(ParaMEDMEM_Swig)
-  ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+  ENDIF(MEDCOUPLING_ENABLE_PYTHON)
   IF(MEDCOUPLING_BUILD_TESTS)
-    IF(NOT MEDCOUPLING_MED_MICROMED)
+    IF(NOT MEDCOUPLING_MICROMED)
       ADD_SUBDIRECTORY(ParaMEDMEMTest)
-    ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+    ENDIF(NOT MEDCOUPLING_MICROMED)
   ENDIF(MEDCOUPLING_BUILD_TESTS)
 ENDIF(MEDCOUPLING_USE_MPI)
 
@@ -73,7 +72,3 @@ ENDIF(MEDCOUPLING_USE_MPI)
 INSTALL(FILES CTestTestfileInstall.cmake
   DESTINATION ${MEDCOUPLING_INSTALL_TESTS}
   RENAME CTestTestfile.cmake)
-
-INSTALL(FILES CTestTestfileInstallMEDCoupling.cmake
-  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling
-  RENAME CTestTestfile.cmake)