MED CMakization.

diff --git a/src/MEDCalculator/Swig/CMakeLists.txt b/src/MEDCalculator/Swig/CMakeLists.txt
index ae7d1ce004a68d550b1c80a6ce28e66f53c15a94..f53e94bb4306186ec3cc31e5b659b55baefe8522 100644 (file)
--- a/src/MEDCalculator/Swig/CMakeLists.txt
+++ b/src/MEDCalculator/Swig/CMakeLists.txt
@@ -21,7 +21,7 @@ FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${MED3_INCLUDES_DIR}
   ${HDF5_INCLUDES_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/MEDCalculator/Test/CMakeLists.txt b/src/MEDCalculator/Test/CMakeLists.txt
index e83c94dd4e13973012405da98d26ea528317644f..03c8b461f80d60d864f7ba66f4b9a8e09457a9ea 100644 (file)
--- a/src/MEDCalculator/Test/CMakeLists.txt
+++ b/src/MEDCalculator/Test/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${CPPUNIT_INCLUDES_DIR}
   ${HDF5_INCLUDES_DIR}
   ${MED3_INCLUDES_DIR}

diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt
index 6d8d01cb7aab652575f23aee8913fabc14283f37..5bd21bb01ca029c865d4a75b3b8944b90e1a97e9 100644 (file)
--- a/src/MEDCouplingCorba_Swig/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt
@@ -26,7 +26,7 @@ SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${OMNIORB_INCLUDES_DIR}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl

diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
index f672d5315a69a1187505da7b3a4617c5f4086b87..ed7625db12162e2883463f5121b788e54099c8d1 100644 (file)
--- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
@@ -24,7 +24,7 @@ SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${OMNIORB_INCLUDES_DIR}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl

diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt
index ef54df555ea4aeb97175bf60d045b0a2fd1848a2..d7824bbe112fe45aa57457b7b8c34dce0862266f 100644 (file)
--- a/src/MEDCoupling_Swig/CMakeLists.txt
+++ b/src/MEDCoupling_Swig/CMakeLists.txt
@@ -19,12 +19,13 @@
 
 FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
+#INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/UseSWIG.cmake)
 
 SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL

diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt
index 378bf46068a4dbe979058b03ebbfe69c317d9f23..ab9ce5673ff5eeda8ca297609e4d0d9ffba24082 100644 (file)
--- a/src/MEDLoader/Swig/CMakeLists.txt
+++ b/src/MEDLoader/Swig/CMakeLists.txt
@@ -24,7 +24,7 @@ SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling_Swig
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling

diff --git a/src/MEDMEM_SWIG/CMakeLists.txt b/src/MEDMEM_SWIG/CMakeLists.txt
index 510b5709f3fd81cd3370efa167569fc3d9bbbaf8..7d6c7263f28039b95f43b47cae38ec919fb49541 100644 (file)
--- a/src/MEDMEM_SWIG/CMakeLists.txt
+++ b/src/MEDMEM_SWIG/CMakeLists.txt
@@ -25,7 +25,7 @@ SET_SOURCE_FILES_PROPERTIES(libMEDMEM_Swig.i PROPERTIES SWIG_FLAGS "-shadow")
 SET_SOURCE_FILES_PROPERTIES(libMEDMEM_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${MED3_INCLUDES_DIR}
   ${HDF5_INCLUDES_DIR}
   ${XDR_INCLUDES_DIR}

diff --git a/src/MedClient/src/CMakeLists.txt b/src/MedClient/src/CMakeLists.txt
index f26abcbc0a4d2cdbf6fe8462444674f78eb18314..35521bf1246edbe5cbf81e771e9a9093297af973 100644 (file)
--- a/src/MedClient/src/CMakeLists.txt
+++ b/src/MedClient/src/CMakeLists.txt
@@ -21,7 +21,7 @@ FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${OMNIORB_INCLUDES_DIR}
   ${MED3_INCLUDES_DIR}
   ${HDF5_INCLUDES_DIR}

diff --git a/src/MedClient/test/test2/CMakeLists.txt b/src/MedClient/test/test2/CMakeLists.txt
index c81d429659abdf1a1a13c4e505321da130d3100c..db2f6734d0aac00eb755557b449bb96c8c712a20 100644 (file)
--- a/src/MedClient/test/test2/CMakeLists.txt
+++ b/src/MedClient/test/test2/CMakeLists.txt
@@ -21,7 +21,7 @@ FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${OMNIORB_INCLUDES_DIR}
   ${MED3_INCLUDES_DIR}
   ${HDF5_INCLUDES_DIR}

diff --git a/src/MedCorba_Swig/CMakeLists.txt b/src/MedCorba_Swig/CMakeLists.txt
index 6d83db0d36cac7abacd98bd5bf37761e37d318da..557ed6bf60bccfdb4bd812e273c4a258a0c254ba 100644 (file)
--- a/src/MedCorba_Swig/CMakeLists.txt
+++ b/src/MedCorba_Swig/CMakeLists.txt
@@ -24,7 +24,7 @@ SET_SOURCE_FILES_PROPERTIES(libMedCorba_Swig.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(libMedCorba_Swig.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${OMNIORB_INCLUDES_DIR}
   ${MED3_INCLUDES_DIR}
   ${HDF5_INCLUDES_DIR}

diff --git a/src/ParaMEDMEM_Swig/CMakeLists.txt b/src/ParaMEDMEM_Swig/CMakeLists.txt
index d944b2e7ebd019503bbdce656e70eeed72083231..b1d1c390b6a7a691444742c352c4d4814bbedc08 100644 (file)
--- a/src/ParaMEDMEM_Swig/CMakeLists.txt
+++ b/src/ParaMEDMEM_Swig/CMakeLists.txt
@@ -24,7 +24,7 @@ SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDE_PATH}
+  ${PYTHON_INCLUDES_DIR}
   ${MED3_INCLUDES_DIR}
   ${HDF5_INCLUDES_DIR}
   ${MPI_INCLUDES_DIR}