From 3f7a64df21623afbe5aa1547959a8f00094ada1d Mon Sep 17 00:00:00 2001 From: ageay Date: Thu, 7 Jun 2012 14:34:23 +0000 Subject: [PATCH] Modifs of cmakization cleaning for standardization. --- idl/CMakeLists.txt | 2 +- src/INTERP_KERNELTest/CMakeLists.txt | 8 ++++---- src/MED/CMakeLists.txt | 8 ++++---- src/MEDCalculator/CMakeLists.txt | 6 +++--- src/MEDCalculator/Swig/CMakeLists.txt | 6 +++--- src/MEDCalculator/Test/CMakeLists.txt | 8 ++++---- src/MEDCoupling/Test/CMakeLists.txt | 2 +- src/MEDCouplingCorba/CMakeLists.txt | 2 +- src/MEDCouplingCorba/Client/CMakeLists.txt | 2 +- src/MEDCouplingCorba/Test/CMakeLists.txt | 2 +- src/MEDCouplingCorba_Swig/CMakeLists.txt | 4 ++-- .../Client/CMakeLists.txt | 4 ++-- src/MEDCoupling_Swig/CMakeLists.txt | 2 +- src/MEDGUI/CMakeLists.txt | 6 +++--- src/MEDLoader/CMakeLists.txt | 4 ++-- src/MEDLoader/Swig/CMakeLists.txt | 6 +++--- src/MEDLoader/Test/CMakeLists.txt | 6 +++--- src/MEDMEM/CMakeLists.txt | 6 +++--- src/MEDMEMBinTest/CMakeLists.txt | 8 ++++---- src/MEDMEMCppTest/CMakeLists.txt | 8 ++++---- src/MEDMEM_I/CMakeLists.txt | 6 +++--- src/MEDMEM_SWIG/CMakeLists.txt | 8 ++++---- src/MEDPartitioner/CMakeLists.txt | 18 +++++++++--------- src/MEDPartitioner/Test/CMakeLists.txt | 18 +++++++++--------- src/MEDSPLITTER/CMakeLists.txt | 18 +++++++++--------- src/MEDSPLITTER/Test/CMakeLists.txt | 18 +++++++++--------- src/MEDSPLITTER_Swig/CMakeLists.txt | 8 ++++---- src/MEDWrapper/Base/CMakeLists.txt | 4 ++-- src/MEDWrapper/Factory/CMakeLists.txt | 6 +++--- src/MEDWrapper/V2_1/Core/CMakeLists.txt | 2 +- src/MEDWrapper/V2_1/Wrapper/CMakeLists.txt | 4 ++-- src/MEDWrapper/V2_2/CMakeLists.txt | 6 +++--- src/MedClient/src/CMakeLists.txt | 10 +++++----- src/MedClient/test/test2/CMakeLists.txt | 10 +++++----- src/MedCorba_Swig/CMakeLists.txt | 8 ++++---- src/ParaMEDCouplingCorba/CMakeLists.txt | 4 ++-- src/ParaMEDLoader/CMakeLists.txt | 6 +++--- src/ParaMEDMEM/CMakeLists.txt | 2 +- src/ParaMEDMEMComponent/CMakeLists.txt | 4 ++-- src/ParaMEDMEMTest/CMakeLists.txt | 2 +- src/ParaMEDMEM_Swig/CMakeLists.txt | 8 ++++---- src/RENUMBER/CMakeLists.txt | 8 ++++---- 42 files changed, 139 insertions(+), 139 deletions(-) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 9fcd6ceea..e51e01704 100644 --- 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 54576bbd2..1910225ca 100644 --- 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 ee4c21109..9cb826351 100644 --- 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 c6495ff25..b61022b2d 100644 --- 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 d223d1bc2..b3eb35cb4 100644 --- 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 139584f38..4c49d5b72 100644 --- 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 f7535d905..1bce663b2 100644 --- 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 898dfe216..ca7dada7a 100644 --- 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 d3e8b7e76..02562a645 100644 --- 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 f13326f5c..9519a8e2d 100644 --- 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 c8bddc650..c07efc004 100644 --- 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 afee9be39..c8ad322f1 100644 --- 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 9b3bdf02d..6fd1b26ed 100644 --- 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 5cb654278..4fd12ef91 100644 --- 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 04a26227c..096577dd6 100644 --- 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 80d6046d5..2c0b86dd7 100644 --- 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 26ec5f933..474ea2cf7 100644 --- 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 458737335..c34c5229e 100644 --- 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 8a806345a..6111529d3 100644 --- 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 9359d06af..1812e418b 100644 --- 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 e44c6dcec..9571f9baf 100644 --- 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 533d82326..aea004555 100644 --- 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 90ff170f0..b70441ec3 100644 --- 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 8e2b10f54..a045e8b16 100644 --- 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 3cc23b634..49dfcbd40 100644 --- 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 6a2e5adea..a98ddd8af 100644 --- 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 14f1e76df..ec9fb8f8d 100644 --- 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 2e6cb5ab1..39c1dbf48 100644 --- 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 5f0b15f91..2c1192773 100644 --- 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 34d9ff3aa..00fe0fb93 100644 --- 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 1d8f71c12..c1d670bba 100644 --- 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 dc3424c49..a53d6fd01 100644 --- 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 19438c548..18c28e6b7 100644 --- 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 496938fd1..d949facb5 100644 --- 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 4f811e2cf..65b033cf2 100644 --- 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 aa9ce8488..15ac02f74 100644 --- 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 423592313..b4d65d042 100644 --- 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 874cb1511..8ed9a6922 100644 --- 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 ec9e621f1..6363c69b2 100644 --- 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 3c0767f22..1a0e54e0d 100644 --- 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 d4de72f06..cc283bafe 100644 --- 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 62db78727..1dd67e805 100644 --- 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 -- 2.39.2