Modifs of cmakization cleaning for standardization.

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 9fcd6ceea22b474e07e02393128c3c0fc044eca1..e51e01704a99b34713fd8c7864d5cc3044910ce0 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/UseOMNIORB.cmake)
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}
   )

diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt
index 54576bbd2b243c49459c24812adc2eead134bb33..1910225caaa63df56409caa4b58847977bec87a3 100644 (file)
--- a/src/INTERP_KERNELTest/CMakeLists.txt
+++ b/src/INTERP_KERNELTest/CMakeLists.txt
@@ -18,10 +18,10 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${CPPUNIT_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${XDR_INCLUDES_DIR}
+  ${CPPUNIT_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases

diff --git a/src/MED/CMakeLists.txt b/src/MED/CMakeLists.txt
index ee4c211090b2e691a134317cd5286cab4e11df6f..9cb8263512734a6fef406586ee8eb4e09d9371f9 100644 (file)
--- a/src/MED/CMakeLists.txt
+++ b/src/MED/CMakeLists.txt
@@ -18,10 +18,10 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${XDR_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM_I

diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt
index c6495ff256b840042fc18b22ddf20d6a82aea3cb..b61022b2d8c8e1a0432ed4f8040ead74d3c5f0bb 100644 (file)
--- a/src/MEDCalculator/CMakeLists.txt
+++ b/src/MEDCalculator/CMakeLists.txt
@@ -21,9 +21,9 @@ ADD_SUBDIRECTORY(Swig)
 ADD_SUBDIRECTORY(Test)
 
 INCLUDE_DIRECTORIES(
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${OMNIORB_INCLUDES_DIR}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba

diff --git a/src/MEDCalculator/Swig/CMakeLists.txt b/src/MEDCalculator/Swig/CMakeLists.txt
index d223d1bc2aec1eee64662d4bcc705fd014578675..b3eb35cb4a9de464bdff2912c8ec1316dfb1948f 100644 (file)
--- a/src/MEDCalculator/Swig/CMakeLists.txt
+++ b/src/MEDCalculator/Swig/CMakeLists.txt
@@ -22,9 +22,9 @@ FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDLoader

diff --git a/src/MEDCalculator/Test/CMakeLists.txt b/src/MEDCalculator/Test/CMakeLists.txt
index 139584f3892559f9ee2405002e8ef07c7f09ed09..4c49d5b722c384ca35f04092cea87759b7590f01 100644 (file)
--- a/src/MEDCalculator/Test/CMakeLists.txt
+++ b/src/MEDCalculator/Test/CMakeLists.txt
@@ -18,10 +18,10 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${CPPUNIT_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${CPPUNIT_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../Swig
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling

diff --git a/src/MEDCoupling/Test/CMakeLists.txt b/src/MEDCoupling/Test/CMakeLists.txt
index f7535d9051a94b29fc1c335e1d66be42fce8202c..1bce663b2ada0040cd1661b238a7982788785de0 100644 (file)
--- a/src/MEDCoupling/Test/CMakeLists.txt
+++ b/src/MEDCoupling/Test/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  $(CPPUNIT_INCLUDES_DIR)
+  $(CPPUNIT_INCLUDE_DIRS)
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Bases

diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt
index 898dfe21656d71bd0dbb8ae8fcfc2b2745024e49..ca7dada7a301da41e5633489d544b77a0001faea 100644 (file)
--- a/src/MEDCouplingCorba/CMakeLists.txt
+++ b/src/MEDCouplingCorba/CMakeLists.txt
@@ -21,7 +21,7 @@ ADD_SUBDIRECTORY(Client)
 ADD_SUBDIRECTORY(Test)
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling

diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt
index d3e8b7e761364286629b3041bd10f23000326c67..02562a645cac3a49a1950e600477b514a4c9572e 100644 (file)
--- a/src/MEDCouplingCorba/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba/Client/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling

diff --git a/src/MEDCouplingCorba/Test/CMakeLists.txt b/src/MEDCouplingCorba/Test/CMakeLists.txt
index f13326f5c3be3f538ed449dd3c16fa70c1da4b80..9519a8e2d7035d8b90fd77b421aae2c37540556e 100644 (file)
--- a/src/MEDCouplingCorba/Test/CMakeLists.txt
+++ b/src/MEDCouplingCorba/Test/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/..

diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt
index c8bddc650a7f4c4e6685ff5c2fe31b4f9e4b9ccd..c07efc004b5fa5b7cb1cfbe98a57eea2ab6494bb 100644 (file)
--- a/src/MEDCouplingCorba_Swig/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt
@@ -27,8 +27,8 @@ SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${OMNIORB_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
index afee9be39faf41d2ad53b92f5290fd93d2ce7349..c8ad322f189aefb054c50aa73e48fa9e750a03b2 100644 (file)
--- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
@@ -25,8 +25,8 @@ SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${OMNIORB_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt
index 9b3bdf02d508f9906b346f5004a43c03081e5b69..6fd1b26edbc5cd194dc71cba8bf8b780ac7e55c7 100644 (file)
--- a/src/MEDCoupling_Swig/CMakeLists.txt
+++ b/src/MEDCoupling_Swig/CMakeLists.txt
@@ -27,7 +27,7 @@ SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL

diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt
index 5cb654278db86ce8e9aa96cae8af0b6699c365e0..4fd12ef91f5d1f87ae3e95f0e24e0a59fe57a2f3 100644 (file)
--- a/src/MEDGUI/CMakeLists.txt
+++ b/src/MEDGUI/CMakeLists.txt
@@ -36,9 +36,9 @@ QT4_WRAP_UI(MEDGUI_FORMS_HEADERS ${MEDGUI_FORMS})
 #QT4_ADD_RESOURCES(MEDGUI_RESOURCES_RCC ${MEDGUI_RESOURCES})
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
-  ${CAS_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
+  ${CAS_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${GUI_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt
index 04a26227c85bf4d090e3ce0399e5b0e03d1120b3..096577dd68098894e57ff9756eddf67f6f7e8a2f 100644 (file)
--- a/src/MEDLoader/CMakeLists.txt
+++ b/src/MEDLoader/CMakeLists.txt
@@ -21,8 +21,8 @@ ADD_SUBDIRECTORY(Swig)
 ADD_SUBDIRECTORY(Test)
 
 INCLUDE_DIRECTORIES(
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases

diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt
index 80d6046d56df4ae493a01de30bd72664a4d318da..2c0b86dd77b7dec06391765f8cc3a46a9b7f6a08 100644 (file)
--- a/src/MEDLoader/Swig/CMakeLists.txt
+++ b/src/MEDLoader/Swig/CMakeLists.txt
@@ -26,7 +26,7 @@ SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling_Swig
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling
@@ -39,8 +39,8 @@ SWIG_ADD_MODULE(MEDLoader python MEDLoader.i)
 SWIG_LINK_LIBRARIES(MEDLoader ${PYTHON_LIBRARIES} medloader)
 
 INCLUDE_DIRECTORIES(
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Geometric2D

diff --git a/src/MEDLoader/Test/CMakeLists.txt b/src/MEDLoader/Test/CMakeLists.txt
index 26ec5f933965155f672822a4848b30657c6f0ad5..474ea2cf782753dc912b613f34e1f21b36254d2f 100644 (file)
--- a/src/MEDLoader/Test/CMakeLists.txt
+++ b/src/MEDLoader/Test/CMakeLists.txt
@@ -18,9 +18,9 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${CPPUNIT_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
+  ${CPPUNIT_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL

diff --git a/src/MEDMEM/CMakeLists.txt b/src/MEDMEM/CMakeLists.txt
index 4587373353685da0a3ad57026e5dffe4e107c40e..c34c5229ef39868ca0afd3e5940def3037225389 100644 (file)
--- a/src/MEDMEM/CMakeLists.txt
+++ b/src/MEDMEM/CMakeLists.txt
@@ -18,9 +18,9 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${XDR_INCLUDES_DIR}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases

diff --git a/src/MEDMEMBinTest/CMakeLists.txt b/src/MEDMEMBinTest/CMakeLists.txt
index 8a806345aaac92a76885fdaf73a3b9193069df5a..6111529d3db0c1c1284d2d9b62532f5ed132f7ce 100644 (file)
--- a/src/MEDMEMBinTest/CMakeLists.txt
+++ b/src/MEDMEMBinTest/CMakeLists.txt
@@ -18,10 +18,10 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${XDR_INCLUDES_DIR}
-  ${CPPUNIT_INCLUDES_DIR}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIRS}
+  ${CPPUNIT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases

diff --git a/src/MEDMEMCppTest/CMakeLists.txt b/src/MEDMEMCppTest/CMakeLists.txt
index 9359d06af3100ecba36d338d32c042654958d025..1812e418b63b23bfb09e029e40a5324fe512663a 100644 (file)
--- a/src/MEDMEMCppTest/CMakeLists.txt
+++ b/src/MEDMEMCppTest/CMakeLists.txt
@@ -18,10 +18,10 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${XDR_INCLUDES_DIR}
-  ${CPPUNIT_INCLUDES_DIR}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIRS}
+  ${CPPUNIT_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases

diff --git a/src/MEDMEM_I/CMakeLists.txt b/src/MEDMEM_I/CMakeLists.txt
index e44c6dcec1ae84017d914a11ed243b86f4f4793b..9571f9baf122a2131a0ae11bfd64180493bc572e 100644 (file)
--- a/src/MEDMEM_I/CMakeLists.txt
+++ b/src/MEDMEM_I/CMakeLists.txt
@@ -18,9 +18,9 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/MEDMEM_SWIG/CMakeLists.txt b/src/MEDMEM_SWIG/CMakeLists.txt
index 533d82326a19e4ae24c661403f4a190caa6230a4..aea004555672ca9e79d3d69e54da5e3db665e9ae 100644 (file)
--- a/src/MEDMEM_SWIG/CMakeLists.txt
+++ b/src/MEDMEM_SWIG/CMakeLists.txt
@@ -25,10 +25,10 @@ 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_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${XDR_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL

diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt
index 90ff170f045796c763c7ddd73a5f933ab08a20ab..b70441ec31b2fded621c76fc2dae356acfd039e5 100644 (file)
--- a/src/MEDPartitioner/CMakeLists.txt
+++ b/src/MEDPartitioner/CMakeLists.txt
@@ -20,15 +20,15 @@
 ADD_SUBDIRECTORY(Test)
 
 INCLUDE_DIRECTORIES(
-  ${PARMETIS_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${SCOTCH_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${LIBXML_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MPI_INCLUDES_DIR}
+  ${PARMETIS_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${SCOTCH_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MPI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL

diff --git a/src/MEDPartitioner/Test/CMakeLists.txt b/src/MEDPartitioner/Test/CMakeLists.txt
index 8e2b10f54313c12027f34fb3ce740b9b97daa498..a045e8b1666565388250045541c457543d4cc4cd 100644 (file)
--- a/src/MEDPartitioner/Test/CMakeLists.txt
+++ b/src/MEDPartitioner/Test/CMakeLists.txt
@@ -18,15 +18,15 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PARMETIS_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${SCOTCH_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${LIBXML_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MPI_INCLUDES_DIR}
+  ${PARMETIS_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${SCOTCH_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MPI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDLoader
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling

diff --git a/src/MEDSPLITTER/CMakeLists.txt b/src/MEDSPLITTER/CMakeLists.txt
index 3cc23b634a5f155a24ff12004bd9ac3c9bce939b..49dfcbd40314ddfa4f4a15f25211e6594972f883 100644 (file)
--- a/src/MEDSPLITTER/CMakeLists.txt
+++ b/src/MEDSPLITTER/CMakeLists.txt
@@ -20,15 +20,15 @@
 ADD_SUBDIRECTORY(Test)
 
 INCLUDE_DIRECTORIES(
-  ${PARMETIS_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${SCOTCH_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${LIBXML_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MPI_INCLUDES_DIR}
+  ${PARMETIS_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${SCOTCH_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MPI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases

diff --git a/src/MEDSPLITTER/Test/CMakeLists.txt b/src/MEDSPLITTER/Test/CMakeLists.txt
index 6a2e5adeafc19622d21e685d2f449e489aa035bd..a98ddd8afea801268532a66badd920c07a7997f6 100644 (file)
--- a/src/MEDSPLITTER/Test/CMakeLists.txt
+++ b/src/MEDSPLITTER/Test/CMakeLists.txt
@@ -18,15 +18,15 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${PARMETIS_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${SCOTCH_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${LIBXML_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MPI_INCLUDES_DIR}
+  ${PARMETIS_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${SCOTCH_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${LIBXML_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MPI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNELTest # for BasicMainTest.cxx

diff --git a/src/MEDSPLITTER_Swig/CMakeLists.txt b/src/MEDSPLITTER_Swig/CMakeLists.txt
index 14f1e76df801b1a6ceef5fe49728b2d9f7eadacb..ec9fb8f8d62e2643754ae6e15d98cf1c7ba3e4ba 100644 (file)
--- a/src/MEDSPLITTER_Swig/CMakeLists.txt
+++ b/src/MEDSPLITTER_Swig/CMakeLists.txt
@@ -25,10 +25,10 @@ SET_SOURCE_FILES_PROPERTIES(libMEDSPLITTER_Swig.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(libMEDSPLITTER_Swig.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDSPLITTER
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM

diff --git a/src/MEDWrapper/Base/CMakeLists.txt b/src/MEDWrapper/Base/CMakeLists.txt
index 2e6cb5ab1b8339b6ef625d1167fe8af642a2842d..39c1dbf48812341d9af8142b5981d821ca0f4601 100644 (file)
--- a/src/MEDWrapper/Base/CMakeLists.txt
+++ b/src/MEDWrapper/Base/CMakeLists.txt
@@ -18,8 +18,8 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${HDF5_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
+  ${HDF5_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   )
 

diff --git a/src/MEDWrapper/Factory/CMakeLists.txt b/src/MEDWrapper/Factory/CMakeLists.txt
index 5f0b15f9184ec56bee51e402440ee829b547bcfd..2c11927734d20ccb939ca705fbc59933ccf952ee 100644 (file)
--- a/src/MEDWrapper/Factory/CMakeLists.txt
+++ b/src/MEDWrapper/Factory/CMakeLists.txt
@@ -18,9 +18,9 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${HDF5_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
+  ${HDF5_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Base
   ${CMAKE_CURRENT_SOURCE_DIR}/../V2_1/Wrapper
   ${CMAKE_CURRENT_SOURCE_DIR}/../V2_2

diff --git a/src/MEDWrapper/V2_1/Core/CMakeLists.txt b/src/MEDWrapper/V2_1/Core/CMakeLists.txt
index 34d9ff3aa6b545f3083f32620dfce973abb85fbc..00fe0fb936c4323df328cb926144c4effacfb1d0 100644 (file)
--- a/src/MEDWrapper/V2_1/Core/CMakeLists.txt
+++ b/src/MEDWrapper/V2_1/Core/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${HDF5_INCLUDES_DIR}
+  ${HDF5_INCLUDE_DIRS}
   )
 
 SET(TOOLS_HDFI_SOURCES

diff --git a/src/MEDWrapper/V2_1/Wrapper/CMakeLists.txt b/src/MEDWrapper/V2_1/Wrapper/CMakeLists.txt
index 1d8f71c12511d8d2cb6b543a7311d3879ba0f5d6..c1d670bbad3d6970e752db7fcd61ac2bc236315c 100644 (file)
--- a/src/MEDWrapper/V2_1/Wrapper/CMakeLists.txt
+++ b/src/MEDWrapper/V2_1/Wrapper/CMakeLists.txt
@@ -18,8 +18,8 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${HDF5_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
+  ${HDF5_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Base
   ${CMAKE_CURRENT_SOURCE_DIR}/../Core
   )

diff --git a/src/MEDWrapper/V2_2/CMakeLists.txt b/src/MEDWrapper/V2_2/CMakeLists.txt
index dc3424c49f609188d8458582b462f7cb25e785a4..a53d6fd01aad8faad5860f6a8dbfca5e8503b00e 100644 (file)
--- a/src/MEDWrapper/V2_2/CMakeLists.txt
+++ b/src/MEDWrapper/V2_2/CMakeLists.txt
@@ -18,9 +18,9 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${BOOST_INCLUDES_DIR}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${BOOST_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Base
   )
 

diff --git a/src/MedClient/src/CMakeLists.txt b/src/MedClient/src/CMakeLists.txt
index 19438c548f02d453c2646d2a67ab0d32ac0793b8..18c28e6b79c9965e57a8043f179818ca81479c8a 100644 (file)
--- a/src/MedClient/src/CMakeLists.txt
+++ b/src/MedClient/src/CMakeLists.txt
@@ -22,11 +22,11 @@ FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${OMNIORB_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${XDR_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/MedClient/test/test2/CMakeLists.txt b/src/MedClient/test/test2/CMakeLists.txt
index 496938fd1f0913636a0702fa2a122903a1a8622e..d949facb5ecbed2fcf6a2917c1c4f3ea107a6d12 100644 (file)
--- a/src/MedClient/test/test2/CMakeLists.txt
+++ b/src/MedClient/test/test2/CMakeLists.txt
@@ -22,11 +22,11 @@ FIND_PACKAGE(SWIG REQUIRED)
 INCLUDE(${SWIG_USE_FILE})
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${OMNIORB_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${XDR_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${XDR_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/MedCorba_Swig/CMakeLists.txt b/src/MedCorba_Swig/CMakeLists.txt
index 4f811e2cf28011b0aaea5e13908d401bdf1f0c46..65b033cf212a949f7c59d229a028ecc6bca94462 100644 (file)
--- a/src/MedCorba_Swig/CMakeLists.txt
+++ b/src/MedCorba_Swig/CMakeLists.txt
@@ -24,10 +24,10 @@ SET_SOURCE_FILES_PROPERTIES(libMedCorba_Swig.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(libMedCorba_Swig.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${OMNIORB_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${OMNIORB_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}

diff --git a/src/ParaMEDCouplingCorba/CMakeLists.txt b/src/ParaMEDCouplingCorba/CMakeLists.txt
index aa9ce8488e0d33c2c75ec7b4c140d1d90cf5e9db..15ac02f746359d826f3b08fb1214938fe3951203 100644 (file)
--- a/src/ParaMEDCouplingCorba/CMakeLists.txt
+++ b/src/ParaMEDCouplingCorba/CMakeLists.txt
@@ -18,8 +18,8 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
-  ${MPI_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
+  ${MPI_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba

diff --git a/src/ParaMEDLoader/CMakeLists.txt b/src/ParaMEDLoader/CMakeLists.txt
index 42359231303e0214eff4ecca559c51275e8be223..b4d65d0429ae72c9b45709eb27cf0767a7dae92f 100644 (file)
--- a/src/ParaMEDLoader/CMakeLists.txt
+++ b/src/ParaMEDLoader/CMakeLists.txt
@@ -18,9 +18,9 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MPI_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
+  ${MPI_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling

diff --git a/src/ParaMEDMEM/CMakeLists.txt b/src/ParaMEDMEM/CMakeLists.txt
index 874cb15112317631df4a7e6ead0ab8448a88314e..8ed9a692245a2881c1159dee6307bb310b8654e7 100644 (file)
--- a/src/ParaMEDMEM/CMakeLists.txt
+++ b/src/ParaMEDMEM/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MPI_INCLUDES_DIR}
+  ${MPI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL

diff --git a/src/ParaMEDMEMComponent/CMakeLists.txt b/src/ParaMEDMEMComponent/CMakeLists.txt
index ec9e621f1a7edf6b648d0da8f50a4f130d05af64..6363c69b2cc0bd6d60f1cd91d905131672760c14 100644 (file)
--- a/src/ParaMEDMEMComponent/CMakeLists.txt
+++ b/src/ParaMEDMEMComponent/CMakeLists.txt
@@ -18,8 +18,8 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${OMNIORB_INCLUDES_DIR}
-  ${MPI_INCLUDES_DIR}
+  ${OMNIORB_INCLUDE_DIRS}
+  ${MPI_INCLUDE_DIRS}
   ${KERNEL_ROOT_DIR}/include/salome
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM

diff --git a/src/ParaMEDMEMTest/CMakeLists.txt b/src/ParaMEDMEMTest/CMakeLists.txt
index 3c0767f2223d4f2e0cc2b9e3628b7fb07f36261d..1a0e54e0d849cb4bfed9ffc19287a232e38de438 100644 (file)
--- a/src/ParaMEDMEMTest/CMakeLists.txt
+++ b/src/ParaMEDMEMTest/CMakeLists.txt
@@ -18,7 +18,7 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${MPI_INCLUDES_DIR}
+  ${MPI_INCLUDE_DIRS}
   ${CPPUNIT_INCLUDE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDLoader
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM

diff --git a/src/ParaMEDMEM_Swig/CMakeLists.txt b/src/ParaMEDMEM_Swig/CMakeLists.txt
index d4de72f067131cb59a0177b2cc69d0f3c064685d..cc283bafefd1ab6321f2f358556e9c12a2f49e84 100644 (file)
--- a/src/ParaMEDMEM_Swig/CMakeLists.txt
+++ b/src/ParaMEDMEM_Swig/CMakeLists.txt
@@ -25,10 +25,10 @@ SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES SWIG_FLAGS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PYTHON_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
-  ${MPI_INCLUDES_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
+  ${MPI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../ParaMEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling_Swig

diff --git a/src/RENUMBER/CMakeLists.txt b/src/RENUMBER/CMakeLists.txt
index 62db787271f91e2ea7b60fdf50d5cb8c5222edef..1dd67e805c66237e895c13f971f63c8fb117fe13 100644 (file)
--- a/src/RENUMBER/CMakeLists.txt
+++ b/src/RENUMBER/CMakeLists.txt
@@ -18,10 +18,10 @@
 #
 
 INCLUDE_DIRECTORIES(
-  ${BOOST_INCLUDES_DIR}
-  ${METIS_INCLUDES_DIR}
-  ${MED3_INCLUDES_DIR}
-  ${HDF5_INCLUDES_DIR}
+  ${BOOST_INCLUDE_DIRS}
+  ${METIS_INCLUDE_DIRS}
+  ${MED3_INCLUDE_DIRS}
+  ${HDF5_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDMEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases