From: ageay <ageay>
Date: Fri, 30 Mar 2012 08:35:35 +0000 (+0000)
Subject: MED CMakization.
X-Git-Tag: V6_main_FINAL~707
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=710b6d03834b01a98f652fe5cf464cfbaaa9ff2f;p=tools%2Fmedcoupling.git

MED CMakization.
---

diff --git a/src/MEDCalculator/Swig/CMakeLists.txt b/src/MEDCalculator/Swig/CMakeLists.txt
index ae7d1ce00..f53e94bb4 100644
--- 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 e83c94dd4..03c8b461f 100644
--- 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 6d8d01cb7..5bd21bb01 100644
--- 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 f672d5315..ed7625db1 100644
--- 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 ef54df555..d7824bbe1 100644
--- 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 378bf4606..ab9ce5673 100644
--- 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 510b5709f..7d6c7263f 100644
--- 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 f26abcbc0..35521bf12 100644
--- 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 c81d42965..db2f6734d 100644
--- 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 6d83db0d3..557ed6bf6 100644
--- 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 d944b2e7e..b1d1c390b 100644
--- 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}