X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=b2514fb0fb8b15e80573f64aebb39043ce48babc;hb=f902e2a3f15308fda09171c8c3a63201807c1589;hp=62ef3fb7c08659123ff5df1c64d4126613b059e7;hpb=69a4d09504782062dcb4da18b9316ca6c59af5c3;p=tools%2Fmedcoupling.git

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 62ef3fb7c..b2514fb0f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015-2024  CEA, EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -14,26 +14,32 @@
 # 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
+#
+
+if(MED_INT_IS_LONG)
+  add_definitions(-DMED_INT_IS_LONG)
+endif(MED_INT_IS_LONG)
 
 # InterpKERNEL
 ADD_SUBDIRECTORY(INTERP_KERNEL)
 IF(MEDCOUPLING_BUILD_TESTS)
-  IF(NOT MEDCOUPLING_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)
+ADD_SUBDIRECTORY(ICoCo)
+
 IF(MEDCOUPLING_ENABLE_PYTHON)
   ADD_SUBDIRECTORY(MEDCoupling_Swig)
+  ADD_SUBDIRECTORY(PyWrapping)
 ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
-
 IF(NOT MEDCOUPLING_MICROMED)
   # MEDLoader
   ADD_SUBDIRECTORY(MEDLoader)
-  
+
   # RENUMBER
   IF(MEDCOUPLING_ENABLE_RENUMBER)
     ADD_SUBDIRECTORY(RENUMBER)
@@ -41,7 +47,7 @@ IF(NOT MEDCOUPLING_MICROMED)
       ADD_SUBDIRECTORY(RENUMBER_Swig)
     ENDIF(MEDCOUPLING_ENABLE_PYTHON)
   ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
-  
+
   # MEDPartitioner
   IF(MEDCOUPLING_ENABLE_PARTITIONER)
     ADD_SUBDIRECTORY(MEDPartitioner)
@@ -54,7 +60,7 @@ ENDIF(NOT MEDCOUPLING_MICROMED)
 IF(MEDCOUPLING_USE_MPI)
   # ParaMEDMEM
   ADD_SUBDIRECTORY(ParaMEDMEM)
-  
+
   # ParaMEDLoader
   IF(NOT MEDCOUPLING_MICROMED)
     ADD_SUBDIRECTORY(ParaMEDLoader)
@@ -70,10 +76,6 @@ IF(MEDCOUPLING_USE_MPI)
 ENDIF(MEDCOUPLING_USE_MPI)
 
 # Application tests
-INSTALL(FILES CTestTestfileInstall.cmake
-  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}
-  RENAME CTestTestfile.cmake)
+configure_file(CTestTestfileInstall.cmake.in "CTestTestfileST.cmake" @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/CTestTestfileST.cmake DESTINATION ${MEDCOUPLING_INSTALL_TESTS} RENAME CTestTestfile.cmake)
 
-INSTALL(FILES CTestTestfileInstallMEDCoupling.cmake
-  DESTINATION ${MEDCOUPLING_INSTALL_TESTS}/MEDCoupling
-  RENAME CTestTestfile.cmake)