From 954c157336f0cab86a6c47d9ae780e243bdc99a4 Mon Sep 17 00:00:00 2001 From: ana Date: Tue, 11 Sep 2012 08:37:37 +0000 Subject: [PATCH] 0021679: [CEA 568] 64 bits version of the MED component on windows --- src/INTERP_KERNEL/CMakeLists.txt | 1 + src/INTERP_KERNELTest/CMakeLists.txt | 19 +-- src/MED/CMakeLists.txt | 10 +- src/MEDCalculator/CMakeLists.txt | 8 +- src/MEDCalculator/Swig/CMakeLists.txt | 12 +- src/MEDCalculator/Test/CMakeLists.txt | 10 +- src/MEDCoupling/CMakeLists.txt | 6 +- src/MEDCoupling/Test/CMakeLists.txt | 15 +-- src/MEDCouplingCorba/CMakeLists.txt | 4 +- src/MEDCouplingCorba/Client/CMakeLists.txt | 4 +- src/MEDCouplingCorba/Test/CMakeLists.txt | 6 +- src/MEDCouplingCorba_Swig/CMakeLists.txt | 12 +- .../Client/CMakeLists.txt | 12 +- src/MEDCoupling_Swig/CMakeLists.txt | 33 +++-- src/MEDGUI/CMakeLists.txt | 8 +- src/MEDLoader/CMakeLists.txt | 6 +- src/MEDLoader/SauvMedConvertor.cxx | 4 +- src/MEDLoader/Swig/CMakeLists.txt | 34 +++--- src/MEDLoader/Swig/SauvLoaderTest.py | 2 +- src/MEDLoader/Test/CMakeLists.txt | 15 +-- src/MEDMEM/CMakeLists.txt | 10 +- src/MEDMEMBinTest/CMakeLists.txt | 31 ++++- src/MEDMEMCppTest/CMakeLists.txt | 16 +-- src/MEDMEM_I/CMakeLists.txt | 8 +- src/MEDMEM_SWIG/CMakeLists.txt | 50 ++++++-- src/MEDPartitioner/CMakeLists.txt | 113 +++++++++--------- src/MEDPartitioner/MEDPARTITIONER.hxx | 8 +- .../MEDPARTITIONER_ConnectZone.hxx | 2 +- src/MEDPartitioner/MEDPARTITIONER_Graph.hxx | 2 +- .../MEDPARTITIONER_MeshCollection.hxx | 2 +- .../MEDPARTITIONER_MeshCollectionDriver.hxx | 2 +- .../MEDPARTITIONER_ParaDomainSelector.hxx | 2 +- .../MEDPARTITIONER_SkyLineArray.hxx | 2 +- .../MEDPARTITIONER_UserGraph.hxx | 2 +- src/MEDPartitioner/MEDPARTITIONER_Utils.hxx | 70 +++++------ src/MEDPartitioner/Test/CMakeLists.txt | 30 ++--- src/MEDSPLITTER/CMakeLists.txt | 66 +++++----- src/MEDSPLITTER/Test/CMakeLists.txt | 96 +++++++++------ src/MEDSPLITTER_Swig/CMakeLists.txt | 23 ++-- src/MEDWrapper/Base/CMakeLists.txt | 15 ++- src/MEDWrapper/Factory/CMakeLists.txt | 24 ++-- src/MEDWrapper/V2_1/Core/CMakeLists.txt | 8 +- src/MEDWrapper/V2_1/Wrapper/CMakeLists.txt | 8 +- src/MEDWrapper/V2_2/CMakeLists.txt | 10 +- src/MedClient/src/CMakeLists.txt | 20 ++-- src/MedClient/test/test2/CMakeLists.txt | 18 +-- src/MedCorba_Swig/CMakeLists.txt | 14 +-- src/ParaMEDCouplingCorba/CMakeLists.txt | 6 +- src/ParaMEDLoader/CMakeLists.txt | 10 +- src/ParaMEDMEM/CMakeLists.txt | 4 +- src/ParaMEDMEMComponent/CMakeLists.txt | 6 +- src/ParaMEDMEMTest/CMakeLists.txt | 16 ++- src/ParaMEDMEM_Swig/CMakeLists.txt | 7 +- src/RENUMBER/CMakeLists.txt | 18 +-- src/RENUMBER/RENUMBERDefines.hxx | 8 +- src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx | 2 +- src/RENUMBER/RENUMBER_METISRenumbering.hxx | 2 +- src/RENUMBER/RENUMBER_Renumbering.hxx | 2 +- src/RENUMBER/RenumberingFactory.hxx | 2 +- 59 files changed, 538 insertions(+), 418 deletions(-) diff --git a/src/INTERP_KERNEL/CMakeLists.txt b/src/INTERP_KERNEL/CMakeLists.txt index 7e35c0d34..d48273103 100644 --- a/src/INTERP_KERNEL/CMakeLists.txt +++ b/src/INTERP_KERNEL/CMakeLists.txt @@ -64,6 +64,7 @@ INCLUDE_DIRECTORIES( ) ADD_LIBRARY(interpkernel SHARED ${interpkernel_SOURCES}) +SET_TARGET_PROPERTIES(interpkernel PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}") INSTALL(TARGETS interpkernel DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/INTERP_KERNELTest/CMakeLists.txt b/src/INTERP_KERNELTest/CMakeLists.txt index 54576bbd2..dfc205c39 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 @@ -67,17 +67,18 @@ IF(NOT MED_ENABLE_MICROMED) PerfTest.cxx ) ADD_EXECUTABLE(PerfTest ${PerfTest_SOURCES}) - SET_TARGET_PROPERTIES(PerfTest PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS} ${CPPUNIT_FLAGS}") - TARGET_LINK_LIBRARIES(PerfTest InterpKernelTest ${CPPUNIT_LIBS}) + SET_TARGET_PROPERTIES(PerfTest PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") + TARGET_LINK_LIBRARIES(PerfTest InterpKernelTest ${CPPUNIT_LIBS} ${PLATFORM_LIBS}) + INSTALL(TARGETS PerfTest DESTINATION ${MED_salomebin_BINS}) ENDIF(NOT MED_ENABLE_MICROMED) ADD_LIBRARY(InterpKernelTest SHARED ${InterpKernelTest_SOURCES}) -SET_TARGET_PROPERTIES(InterpKernelTest PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS} ${CPPUNIT_FLAGS}") +SET_TARGET_PROPERTIES(InterpKernelTest PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(InterpKernelTest medmem ${CPPUNIT_LIBS}) ADD_EXECUTABLE(TestINTERP_KERNEL ${TestINTERP_KERNEL_SOURCES}) -SET_TARGET_PROPERTIES(TestINTERP_KERNEL PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS} ${CPPUNIT_FLAGS}") -TARGET_LINK_LIBRARIES(TestINTERP_KERNEL InterpKernelTest ${CPPUNIT_LIBS}) +SET_TARGET_PROPERTIES(TestINTERP_KERNEL PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(TestINTERP_KERNEL InterpKernelTest ${CPPUNIT_LIBS} ${PLATFORM_LIBS}) ADD_TEST(TestINTERP_KERNEL TestINTERP_KERNEL) INSTALL(TARGETS TestINTERP_KERNEL DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MED/CMakeLists.txt b/src/MED/CMakeLists.txt index ee4c21109..a6362e34c 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 @@ -37,7 +37,7 @@ SET(MEDEngine_SOURCES ) ADD_LIBRARY(MEDEngine SHARED ${MEDEngine_SOURCES}) -SET_TARGET_PROPERTIES(MEDEngine PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS} ${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") +SET_TARGET_PROPERTIES(MEDEngine PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDEngine MEDMEMImpl SalomeIDLMED ${TOOLSDS} ${SalomeHDFPersist} ${SalomeContainer} ${SalomeCommunication} ${SalomeLifeCycleCORBA}) INSTALL(TARGETS MEDEngine DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt index c6495ff25..9c9046e77 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 @@ -47,7 +47,7 @@ SET(medcalculator_SOURCES ) ADD_LIBRARY(medcalculator SHARED ${medcalculator_SOURCES}) -SET_TARGET_PROPERTIES(medcalculator PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS}") +SET_TARGET_PROPERTIES(medcalculator PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS}") TARGET_LINK_LIBRARIES(medcalculator medloader medcouplingcorba ${KERNEL_LDFLAGS} ${SALOMELocalTrace} ${SalomeNS} ${OpUtil}) INSTALL(TARGETS medcalculator DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDCalculator/Swig/CMakeLists.txt b/src/MEDCalculator/Swig/CMakeLists.txt index d223d1bc2..b3f8258e1 100644 --- a/src/MEDCalculator/Swig/CMakeLists.txt +++ b/src/MEDCalculator/Swig/CMakeLists.txt @@ -17,14 +17,14 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) +INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake) 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 @@ -45,10 +45,10 @@ TARGET_LINK_LIBRARIES(medcalculatorspython interpkernel ${PYTHON_LIBS}) INSTALL(TARGETS medcalculatorspython DESTINATION ${MED_salomelib_LIBS}) SET_SOURCE_FILES_PROPERTIES(MEDCalculator.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(MEDCalculator.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(MEDCalculator.i PROPERTIES SWIG_DEFINITIONS "-shadow") SWIG_ADD_MODULE(MEDCalculator python MEDCalculator.i) -SWIG_LINK_LIBRARIES(MEDCalculator ${PYTHON_LIBRARIES} medcalculator) +SWIG_LINK_LIBRARIES(MEDCalculator ${PYTHON_LIBS} medcalculator) FILE(GLOB medcalculatorspython_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${medcalculatorspython_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) diff --git a/src/MEDCalculator/Test/CMakeLists.txt b/src/MEDCalculator/Test/CMakeLists.txt index 139584f38..5d320587b 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 @@ -37,7 +37,7 @@ SET(TestMEDCalculator_SOURCES ) ADD_EXECUTABLE(TestMEDCalculator ${TestMEDCalculator_SOURCES}) -SET_TARGET_PROPERTIES(TestMEDCalculator PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${CPPUNIT_FLAGS}") +SET_TARGET_PROPERTIES(TestMEDCalculator PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${CPPUNIT_DEFINITIONS}") TARGET_LINK_LIBRARIES(TestMEDCalculator medcalculatorspython medcalculator ${CPPUNIT_LIBS}) ADD_TEST(TestMEDCalculator TestMEDCalculator) diff --git a/src/MEDCoupling/CMakeLists.txt b/src/MEDCoupling/CMakeLists.txt index 047589fa8..a7d1a19ed 100644 --- a/src/MEDCoupling/CMakeLists.txt +++ b/src/MEDCoupling/CMakeLists.txt @@ -54,11 +54,13 @@ SET(medcouplingremapper_SOURCES ) ADD_LIBRARY(medcoupling SHARED ${medcoupling_SOURCES}) -TARGET_LINK_LIBRARIES(medcoupling interpkernel) +SET_TARGET_PROPERTIES(medcoupling PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(medcoupling interpkernel ${PLATFORM_LIBS}) INSTALL(TARGETS medcoupling DESTINATION ${MED_salomelib_LIBS}) ADD_LIBRARY(medcouplingremapper SHARED ${medcouplingremapper_SOURCES}) -TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling) +TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling ${PLATFORM_LIBS}) +SET_TARGET_PROPERTIES(medcouplingremapper PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}") INSTALL(TARGETS medcouplingremapper DESTINATION ${MED_salomelib_LIBS}) FILE(GLOB medcoupling_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") diff --git a/src/MEDCoupling/Test/CMakeLists.txt b/src/MEDCoupling/Test/CMakeLists.txt index f7535d905..366c60e9f 100644 --- a/src/MEDCoupling/Test/CMakeLists.txt +++ b/src/MEDCoupling/Test/CMakeLists.txt @@ -18,7 +18,8 @@ # INCLUDE_DIRECTORIES( - $(CPPUNIT_INCLUDES_DIR) + ${CPPUNIT_INCLUDE_DIRS} + ${PTHREADS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Bases @@ -51,18 +52,18 @@ SET(TestMEDCouplingExamples_SOURCES ) ADD_EXECUTABLE(TestMEDCoupling ${TestMEDCoupling_SOURCES}) -SET_TARGET_PROPERTIES(TestMEDCoupling PROPERTIES COMPILE_FLAGS "${CPPUNIT_FLAGS}") -TARGET_LINK_LIBRARIES(TestMEDCoupling medcoupling ${CPPUNIT_LIBS}) +SET_TARGET_PROPERTIES(TestMEDCoupling PROPERTIES COMPILE_FLAGS "${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(TestMEDCoupling medcoupling ${CPPUNIT_LIBS} ${PLATFORM_LIBS}) ADD_TEST(TestMEDCoupling TestMEDCoupling) ADD_EXECUTABLE(TestMEDCouplingRemapper ${TestMEDCouplingRemapper_SOURCES}) -SET_TARGET_PROPERTIES(TestMEDCouplingRemapper PROPERTIES COMPILE_FLAGS "${CPPUNIT_FLAGS}") -TARGET_LINK_LIBRARIES(TestMEDCouplingRemapper medcouplingremapper ${CPPUNIT_LIBS}) +SET_TARGET_PROPERTIES(TestMEDCouplingRemapper PROPERTIES COMPILE_FLAGS "${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(TestMEDCouplingRemapper medcouplingremapper interpkernel medcoupling ${CPPUNIT_LIBS} ${PLATFORM_LIBS}) ADD_TEST(TestMEDCouplingRemapper TestMEDCouplingRemapper) ADD_EXECUTABLE(TestMEDCouplingExamples ${TestMEDCouplingExamples_SOURCES}) -SET_TARGET_PROPERTIES(TestMEDCouplingExamples PROPERTIES COMPILE_FLAGS "${CPPUNIT_FLAGS}") -TARGET_LINK_LIBRARIES(TestMEDCouplingExamples medcoupling ${CPPUNIT_LIBS}) +SET_TARGET_PROPERTIES(TestMEDCouplingExamples PROPERTIES COMPILE_FLAGS "${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(TestMEDCouplingExamples medcoupling ${CPPUNIT_LIBS} ${PLATFORM_LIBS}) ADD_TEST(TestMEDCouplingExamples TestMEDCouplingExamples) INSTALL(TARGETS TestMEDCoupling TestMEDCouplingRemapper DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt index 898dfe216..c3905fd24 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 @@ -46,7 +46,7 @@ SET(medcouplingcorba_SOURCES ) ADD_LIBRARY(medcouplingcorba SHARED ${medcouplingcorba_SOURCES}) -SET_TARGET_PROPERTIES(medcouplingcorba PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS}") +SET_TARGET_PROPERTIES(medcouplingcorba PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") TARGET_LINK_LIBRARIES(medcouplingcorba medcoupling SalomeIDLMED) INSTALL(TARGETS medcouplingcorba DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt index d3e8b7e76..f2fa96900 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 @@ -40,7 +40,7 @@ SET(medcouplingclient_SOURCES ) ADD_LIBRARY(medcouplingclient SHARED ${medcouplingclient_SOURCES}) -SET_TARGET_PROPERTIES(medcouplingclient PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS}") +SET_TARGET_PROPERTIES(medcouplingclient PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") TARGET_LINK_LIBRARIES(medcouplingclient medcoupling SalomeIDLMED ${OMNIORB_LIBS}) INSTALL(TARGETS medcouplingclient DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDCouplingCorba/Test/CMakeLists.txt b/src/MEDCouplingCorba/Test/CMakeLists.txt index f13326f5c..f37612216 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}/.. @@ -35,7 +35,7 @@ SET(TestMEDCouplingCorbaServ_SOURCES ) ADD_EXECUTABLE(TestMEDCouplingCorbaServ ${TestMEDCouplingCorbaServ_SOURCES}) -SET_TARGET_PROPERTIES(TestMEDCouplingCorbaServ PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS}") +SET_TARGET_PROPERTIES(TestMEDCouplingCorbaServ PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") TARGET_LINK_LIBRARIES(TestMEDCouplingCorbaServ medcouplingcorba SalomeIDLMEDTests ${OMNIORB_LIBS}) SET(TestMEDCouplingCorbaClt_SOURCES @@ -45,7 +45,7 @@ SET(TestMEDCouplingCorbaClt_SOURCES ) ADD_EXECUTABLE(TestMEDCouplingCorbaClt ${TestMEDCouplingCorbaClt_SOURCES}) -SET_TARGET_PROPERTIES(TestMEDCouplingCorbaClt PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS} ${CPPUNIT_FLAGS}") +SET_TARGET_PROPERTIES(TestMEDCouplingCorbaClt PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${CPPUNIT_DEFINITIONS}") TARGET_LINK_LIBRARIES(TestMEDCouplingCorbaClt medcouplingclient SalomeIDLMEDTests ${OMNIORB_LIBS} ${CPPUNIT_LIBS}) INSTALL(TARGETS TestMEDCouplingCorbaServ TestMEDCouplingCorbaClt DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt index c8bddc650..3d77b7212 100644 --- a/src/MEDCouplingCorba_Swig/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt @@ -19,16 +19,16 @@ ADD_SUBDIRECTORY(Client) -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) +INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake) FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(MEDCouplingCorba.i PROPERTIES SWIG_DEFINITIONS "-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} @@ -40,8 +40,8 @@ INCLUDE_DIRECTORIES( ) SWIG_ADD_MODULE(MEDCouplingCorba python MEDCouplingCorba.i) -SWIG_LINK_LIBRARIES(MEDCouplingCorba ${PYTHON_LIBRARIES} medcouplingcorba) -SET_TARGET_PROPERTIES(_MEDCouplingCorba PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS}") +SWIG_LINK_LIBRARIES(MEDCouplingCorba ${PYTHON_LIBS} medcouplingcorba) +SET_TARGET_PROPERTIES(_MEDCouplingCorba PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") INSTALL(TARGETS _MEDCouplingCorba DESTINATION ${MED_salomepythondir}) INSTALL(FILES MEDCouplingCorba.i MEDCouplingCorbaTypemaps.i DESTINATION ${MED_salomeinclude_HEADERS}) diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt index afee9be39..be29dcc87 100644 --- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt @@ -17,16 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) +INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake) FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(MEDCouplingClient.i PROPERTIES SWIG_DEFINITIONS "-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} @@ -38,8 +38,8 @@ INCLUDE_DIRECTORIES( ) SWIG_ADD_MODULE(MEDCouplingClient python MEDCouplingClient.i) -SWIG_LINK_LIBRARIES(MEDCouplingClient ${PYTHON_LIBRARIES} medcouplingclient) -SET_TARGET_PROPERTIES(_MEDCouplingClient PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS}") +SWIG_LINK_LIBRARIES(MEDCouplingClient ${PYTHON_LIBS} medcouplingclient) +SET_TARGET_PROPERTIES(_MEDCouplingClient PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") INSTALL(TARGETS _MEDCouplingClient DESTINATION ${MED_salomepythondir}) INSTALL(FILES MEDCouplingClient.i DESTINATION ${MED_salomeinclude_HEADERS}) diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt index 9b3bdf02d..30008e2fa 100644 --- a/src/MEDCoupling_Swig/CMakeLists.txt +++ b/src/MEDCoupling_Swig/CMakeLists.txt @@ -17,40 +17,47 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) +INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake) 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") +SET_SOURCE_FILES_PROPERTIES(MEDCoupling.i PROPERTIES SWIG_DEFINITIONS "-shadow") INCLUDE_DIRECTORIES( - ${PYTHON_INCLUDES_DIR} + ${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/ExprEval - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints - ) +) SWIG_ADD_MODULE(MEDCoupling python MEDCoupling.i) -SWIG_LINK_LIBRARIES(MEDCoupling ${PYTHON_LIBRARIES} medcoupling) +SWIG_LINK_LIBRARIES(MEDCoupling ${PYTHON_LIBS} ${PLATFORM_LIBS} medcoupling interpkernel) +SET_TARGET_PROPERTIES(_MEDCoupling PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}") SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(MEDCouplingRemapper.i PROPERTIES SWIG_DEFINITIONS "-shadow") SWIG_ADD_MODULE(MEDCouplingRemapper python MEDCouplingRemapper.i) -SWIG_LINK_LIBRARIES(MEDCouplingRemapper ${PYTHON_LIBRARIES} medcouplingremapper) +SWIG_LINK_LIBRARIES(MEDCouplingRemapper ${PYTHON_LIBS} medcouplingremapper interpkernel) +SET_TARGET_PROPERTIES(_MEDCouplingRemapper PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}") + +IF(${MACHINE} STREQUAL WINDOWS) + SET_TARGET_PROPERTIES(_MEDCouplingRemapper PROPERTIES DEBUG_OUTPUT_NAME _MEDCouplingRemapper_d) + SET_TARGET_PROPERTIES(_MEDCoupling PROPERTIES DEBUG_OUTPUT_NAME _MEDCoupling_d) +ENDIF(${MACHINE} STREQUAL WINDOWS) +INSTALL(TARGETS _MEDCoupling _MEDCouplingRemapper DESTINATION ${MED_salomelib_LIBS}) SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDCoupling.py ${CMAKE_CURRENT_BINARY_DIR}/MEDCouplingRemapper.py ${CMAKE_CURRENT_SOURCE_DIR}/libMEDCoupling_Swig.py) -INSTALL(TARGETS _MEDCoupling _MEDCouplingRemapper DESTINATION ${MED_salomepythondir}) -INSTALL(FILES MEDCoupling.i MEDCouplingRemapper.i MEDCouplingTypemaps.i DESTINATION ${MED_salomeinclude_HEADERS}) INSTALL_AND_COMPILE_PYTHON_FILE("${PYFILES_TO_INSTALL}" ${MED_salomescript_PYTHON}) +INSTALL(FILES MEDCoupling.i MEDCouplingRemapper.i MEDCouplingTypemaps.i DESTINATION ${MED_salomeinclude_HEADERS}) +INSTALL(FILES MEDCouplingBasicsTest.py MEDCouplingRemapperTest.py MEDCouplingDataForTest.py DESTINATION ${MED_salomescript_PYTHON}) + ADD_TEST(MEDCouplingBasicsTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingBasicsTest.py) ADD_TEST(MEDCouplingExamplesTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingExamplesTest.py) ADD_TEST(MEDCouplingRemapperTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDCouplingRemapperTest.py) diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt index 5cb654278..ca343368e 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} @@ -58,7 +58,7 @@ SET(MEDGUITS_SOURCES ) ADD_LIBRARY(MEDGUI SHARED ${MEDGUI_SOURCES} ${MEDGUI_HEADERS_MOC} ${MEDGUI_FORMS_HEADERS}) -SET_TARGET_PROPERTIES(MEDGUI PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS} ${CAS_FLAGS} ${BOOST_FLAGS}") +SET_TARGET_PROPERTIES(MEDGUI PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDGUI medcalculator ${QT_MT_LIBS} ${CAS_KERNEL} ${BOOST_LIBS} ${GUI_LDFLAGS} ${SalomeApp} ${CAM} ${LightApp} ${qtx} ${suit} ${SalomeObject}) INSTALL(TARGETS MEDGUI DESTINATION ${MED_salomelib_LIBS}) QT4_INSTALL_TS_RESOURCES("${MEDGUITS_SOURCES}" "${MED_salomeres_DATA}") diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt index 04a26227c..a4d04218e 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 @@ -47,7 +47,7 @@ SET(medloader_SOURCES ) ADD_LIBRARY(medloader SHARED ${medloader_SOURCES}) -SET_TARGET_PROPERTIES(medloader PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS}") +SET_TARGET_PROPERTIES(medloader PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(medloader medcoupling ${MED3_LIBS_C_ONLY} ${HDF5_LIBS}) INSTALL(TARGETS medloader DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDLoader/SauvMedConvertor.cxx b/src/MEDLoader/SauvMedConvertor.cxx index 0345cb180..c53cd7f1c 100644 --- a/src/MEDLoader/SauvMedConvertor.cxx +++ b/src/MEDLoader/SauvMedConvertor.cxx @@ -773,9 +773,9 @@ double ASCIIReader::getDouble() const // 7.70000000000000-100 7.70000000000000+100 7.70000000000000+100 //0123456789012345678901234567890123456789012345678901234567890123456789 const size_t posE = 18; - if ( _curPos[posE] != 'E' && _curPos[posE] != 'e' ) + std::string aStr (_curPos); + if ( aStr.find('E') < 0 && aStr.find('e') < 0 ) { - std::string aStr (_curPos); if ( aStr.size() < posE+1 ) THROW_IK_EXCEPTION("No more doubles (line #" << lineNb() << ")"); aStr.insert( posE, "E", 1 ); diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt index 80d6046d5..2e49678f1 100644 --- a/src/MEDLoader/Swig/CMakeLists.txt +++ b/src/MEDLoader/Swig/CMakeLists.txt @@ -17,42 +17,44 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) +INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake) FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(MEDLoader.i PROPERTIES SWIG_DEFINITIONS "-shadow") INCLUDE_DIRECTORIES( - ${PYTHON_INCLUDES_DIR} + ${PYTHON_INCLUDE_DIRS} + ${MED3_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling_Swig ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Bases - ) - -SWIG_ADD_MODULE(MEDLoader python MEDLoader.i) - -SWIG_LINK_LIBRARIES(MEDLoader ${PYTHON_LIBRARIES} medloader) - -INCLUDE_DIRECTORIES( - ${MED3_INCLUDES_DIR} - ${HDF5_INCLUDES_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Geometric2D ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/ExprEval ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/GaussPoints - ) +) + +SWIG_ADD_MODULE(MEDLoader python MEDLoader.i) +SWIG_LINK_LIBRARIES(MEDLoader ${PYTHON_LIBS} ${PLATFORM_LIBS} medloader medcoupling) +SET_TARGET_PROPERTIES(_MEDLoader PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}") +IF(${MACHINE} STREQUAL WINDOWS) + SET_TARGET_PROPERTIES(_MEDLoader PROPERTIES DEBUG_OUTPUT_NAME _MEDLoader_d) +ENDIF(${MACHINE} STREQUAL WINDOWS) +INSTALL(TARGETS _MEDLoader DESTINATION ${MED_salomelib_LIBS}) -INSTALL(TARGETS _MEDLoader DESTINATION ${MED_salomepythondir}) INSTALL(FILES MEDLoader.i MEDLoaderTypemaps.i DESTINATION ${MED_salomeinclude_HEADERS}) + SET(PYFILES_TO_INSTALL ${CMAKE_CURRENT_BINARY_DIR}/MEDLoader.py ${CMAKE_CURRENT_SOURCE_DIR}/libMEDLoader_Swig.py) INSTALL_AND_COMPILE_PYTHON_FILE("${PYFILES_TO_INSTALL}" ${MED_salomescript_PYTHON}) +INSTALL(FILES MEDLoaderDataForTest.py MEDLoaderTest.py MEDLoaderTest2.py MEDLoaderTest3.py DESTINATION ${MED_salomescript_PYTHON}) + ADD_TEST(MEDLoaderTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDLoaderTest.py) ADD_TEST(MEDLoaderTest2 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDLoaderTest2.py) ADD_TEST(MEDLoaderTest3 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/MEDLoaderTest3.py) diff --git a/src/MEDLoader/Swig/SauvLoaderTest.py b/src/MEDLoader/Swig/SauvLoaderTest.py index d5c8035e8..89f51539f 100644 --- a/src/MEDLoader/Swig/SauvLoaderTest.py +++ b/src/MEDLoader/Swig/SauvLoaderTest.py @@ -155,7 +155,7 @@ class SauvLoaderTest(unittest.TestCase): fof = fieldOnFaces.getFieldOnMeshAtLevel(f1.getTypeOfField(),io1[i][0],io1[i][1],um1) self.assertTrue( d.isEqual( fof.getArray(), 1e-12 )) - os.remove( sauvFile ) + # os.remove( sauvFile ) pass pass diff --git a/src/MEDLoader/Test/CMakeLists.txt b/src/MEDLoader/Test/CMakeLists.txt index 26ec5f933..063cade5a 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 @@ -39,13 +39,14 @@ SET(TestSauvLoader_SOURCES ) ADD_EXECUTABLE(TestMEDLoader ${TestMEDLoader_SOURCES}) -SET_TARGET_PROPERTIES(TestMEDLoader PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${CPPUNIT_FLAGS}") -TARGET_LINK_LIBRARIES(TestMEDLoader medloader ${CPPUNIT_LIBS}) +SET_TARGET_PROPERTIES(TestMEDLoader PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(TestMEDLoader medloader ${CPPUNIT_LIBS} ${PLATFORM_LIBS}) ADD_TEST(TestMEDLoader TestMEDLoader) ADD_EXECUTABLE(TestSauvLoader ${TestSauvLoader_SOURCES}) -SET_TARGET_PROPERTIES(TestSauvLoader PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${CPPUNIT_FLAGS}") -TARGET_LINK_LIBRARIES(TestSauvLoader medloader ${CPPUNIT_LIBS}) +SET_TARGET_PROPERTIES(TestSauvLoader PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") + +TARGET_LINK_LIBRARIES(TestSauvLoader medloader ${CPPUNIT_LIBS} ${PLATFORM_LIBS}) ADD_TEST(TestSauvLoader TestSauvLoader) INSTALL(TARGETS TestMEDLoader TestSauvLoader DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MEDMEM/CMakeLists.txt b/src/MEDMEM/CMakeLists.txt index 458737335..983808522 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 @@ -71,8 +71,8 @@ SET(medmem_SOURCES ) ADD_LIBRARY(medmem SHARED ${medmem_SOURCES}) -SET_TARGET_PROPERTIES(medmem PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") -TARGET_LINK_LIBRARIES(medmem interpkernel ${MED3_LIBS_C_ONLY} ${HDF5_LIBS} ${XDR_LIBS}) +SET_TARGET_PROPERTIES(medmem PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(medmem interpkernel ${MED3_LIBS_C_ONLY} ${HDF5_LIBS} ${XDR_LIBS} ${PLATFORM_LIBS}) INSTALL(TARGETS medmem DESTINATION ${MED_salomelib_LIBS}) FILE(GLOB medmem_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") diff --git a/src/MEDMEMBinTest/CMakeLists.txt b/src/MEDMEMBinTest/CMakeLists.txt index 8a806345a..12ffc1e54 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 @@ -131,6 +131,15 @@ SET(testAnalFile_SOURCES testAnalFile.cxx) SET(test_MEDMEM_MeshingFlica_SOURCES test_MEDMEM_MeshingFlica.cxx) SET(testConvertPolygon_SOURCES testConvertPolygon.cxx) +SET(create_mesh_SOURCES create_mesh.c) +SET(create_mesh_c2q4s2_SOURCES create_mesh_c2q4s2.c) +SET(create_mesh_c3h8q4_SOURCES create_mesh_c3h8q4.c) +SET(create_mesh_c3h8q4_wrong_SOURCES create_mesh_c3h8q4_wrong.c) +SET(create_mesh_c2q4s2_wrong_SOURCES create_mesh_c2q4s2_wrong.c) +SET(create_grid_SOURCES create_grid.c) +SET(create_mesh_c2q4_SOURCES create_mesh_c2q4.c) +SET(create_mesh_c3h8_SOURCES create_mesh_c3h8.c) +SET(create_poly3D_SOURCES create_poly3D.c) SET(ALLMEDMEMBIN_TESTS dumpInterpolation @@ -185,17 +194,27 @@ SET(ALLMEDMEMBIN_TESTS testAnalFile test_MEDMEM_MeshingFlica testConvertPolygon + create_mesh + create_mesh_c2q4s2 + create_mesh_c3h8q4 + create_mesh_c3h8q4_wrong + create_mesh_c2q4s2_wrong + create_grid + create_mesh_c2q4 + create_mesh_c3h8 + create_poly3D ) FOREACH(ALLMEDMEMBIN_TEST ${ALLMEDMEMBIN_TESTS}) ADD_EXECUTABLE(${ALLMEDMEMBIN_TEST} ${${ALLMEDMEMBIN_TEST}_SOURCES}) - SET_TARGET_PROPERTIES(${ALLMEDMEMBIN_TEST} PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") - TARGET_LINK_LIBRARIES(${ALLMEDMEMBIN_TEST} medmem) + SET_TARGET_PROPERTIES(${ALLMEDMEMBIN_TEST} PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${PLATFORM_DEFINITIONS}") + TARGET_LINK_LIBRARIES(${ALLMEDMEMBIN_TEST} medmem ${PLATFORM_LIBS}) ENDFOREACH(ALLMEDMEMBIN_TEST ${ALLMEDMEMBIN_TESTS}) INSTALL(TARGETS ${ALLMEDMEMBIN_TESTS} DESTINATION ${MED_salomebin_BINS}) SET(MEDMEMBINTEST_PYOPT_TEST -c"import sys;import os;import subprocess;os.putenv(\"srcdir\",sys.argv[1]);sys.exit(subprocess.call([\"sh\",sys.argv[2]]))") + ADD_TEST(check_convertToPoly ${PYTHON_EXECUTABLE} ${MEDMEMBINTEST_PYOPT_TEST} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_convertToPoly) ADD_TEST(check_duplicateMED ${PYTHON_EXECUTABLE} ${MEDMEMBINTEST_PYOPT_TEST} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_duplicateMED) ADD_TEST(check_ensight2med ${PYTHON_EXECUTABLE} ${MEDMEMBINTEST_PYOPT_TEST} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/scripts/check_ensight2med) diff --git a/src/MEDMEMCppTest/CMakeLists.txt b/src/MEDMEMCppTest/CMakeLists.txt index 9359d06af..ad869500a 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 @@ -114,15 +114,17 @@ SET(MEDMEMTest_VtkMeshDriver_fault_SOURCES ) ADD_LIBRARY(MEDMEMCppTest SHARED ${MEDMEMCppTest_SOURCES}) -SET_TARGET_PROPERTIES(MEDMEMCppTest PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS} ${CPPUNIT_FLAGS}") +SET_TARGET_PROPERTIES(MEDMEMCppTest PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDMEMCppTest medmem ${CPPUNIT_LIBS}) SET(ALLMEDMEMCPP_TESTS TestMEDMEM MEDMEMTest_Array_fault MEDMEMTest_Connectivity_fault MEDMEMTest_Coordinate_fault MEDMEMTest_Family_fault MEDMEMTest_Field_fault MEDMEMTest_Grid_fault MEDMEMTest_MeshAndMeshing_fault MEDMEMTest_Support_fault MEDMEMTest_VtkFieldDriver_fault MEDMEMTest_VtkMeshDriver_fault) FOREACH(MEDMEMCPP_TEST ${ALLMEDMEMCPP_TESTS}) ADD_EXECUTABLE(${MEDMEMCPP_TEST} ${${MEDMEMCPP_TEST}_SOURCES}) - SET_TARGET_PROPERTIES(${MEDMEMCPP_TEST} PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") - TARGET_LINK_LIBRARIES(${MEDMEMCPP_TEST} MEDMEMCppTest) + SET_TARGET_PROPERTIES(${MEDMEMCPP_TEST} PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${PLATFORM_DEFINITIONS}") + TARGET_LINK_LIBRARIES(${MEDMEMCPP_TEST} MEDMEMCppTest ${PLATFORM_LIBS}) ENDFOREACH(MEDMEMCPP_TEST ${ALLMEDMEMCPP_TESTS}) INSTALL(TARGETS MEDMEMCppTest DESTINATION ${MED_salomelib_LIBS}) INSTALL(TARGETS ${ALLMEDMEMCPP_TESTS} DESTINATION ${MED_salomebin_BINS}) +INSTALL(FILES testMEDMEM.py DESTINATION ${MED_salomebin_BINS}) +INSTALL(FILES MEDMEMTest.hxx MEDMEMCppTestExport.hxx DESTINATION ${MED_salomeinclude_HEADERS}) diff --git a/src/MEDMEM_I/CMakeLists.txt b/src/MEDMEM_I/CMakeLists.txt index e44c6dcec..edba2fed8 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} @@ -42,7 +42,7 @@ SET(MEDMEMImpl_SOURCES ) ADD_LIBRARY(MEDMEMImpl SHARED ${MEDMEMImpl_SOURCES}) -SET_TARGET_PROPERTIES(MEDMEMImpl PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS} ${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") +SET_TARGET_PROPERTIES(MEDMEMImpl PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDMEMImpl medmem SalomeIDLMED) INSTALL(TARGETS MEDMEMImpl DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDMEM_SWIG/CMakeLists.txt b/src/MEDMEM_SWIG/CMakeLists.txt index 533d82326..42a42423a 100644 --- a/src/MEDMEM_SWIG/CMakeLists.txt +++ b/src/MEDMEM_SWIG/CMakeLists.txt @@ -21,14 +21,14 @@ FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(libMEDMEM_Swig.i PROPERTIES CPLUSPLUS ON) -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}") +SET_SOURCE_FILES_PROPERTIES(libMEDMEM_Swig.i PROPERTIES SWIG_DEFINITIONS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libMEDMEM_SwigPYTHON_wrap.cxx PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${PLATFORM_DEFINITIONS}") 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 @@ -37,10 +37,42 @@ INCLUDE_DIRECTORIES( ) SWIG_ADD_MODULE(libMEDMEM_Swig python libMEDMEM_Swig.i) -SWIG_LINK_LIBRARIES(libMEDMEM_Swig ${PYTHON_LIBRARIES} medmem) +SWIG_LINK_LIBRARIES(libMEDMEM_Swig ${PYTHON_LIBS} medmem) +SET_TARGET_PROPERTIES(_libMEDMEM_Swig PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}") +IF(${MACHINE} STREQUAL WINDOWS) + SET_TARGET_PROPERTIES(_libMEDMEM_Swig PROPERTIES DEBUG_OUTPUT_NAME _libMEDMEM_Swig_d) +ENDIF(${MACHINE} STREQUAL WINDOWS) INSTALL(TARGETS _libMEDMEM_Swig DESTINATION ${MED_salomepythondir}) + INSTALL(FILES libMEDMEM_Swig.i my_typemap.i MEDMEM_SWIG_Templates.hxx DESTINATION ${MED_salomeinclude_HEADERS}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libMEDMEM_Swig.py DESTINATION ${MED_salomescript_PYTHON}) -INSTALL(FILES med2sauv sauv2med avs2med DESTINATION ${MED_salomescript_PYTHON} +INSTALL(FILES medutilities.py ${CMAKE_CURRENT_BINARY_DIR}/libMEDMEM_Swig.py DESTINATION ${MED_salomepythondir}) +SET(SCRIPTS + medmem.py + med_test1.py + med_test2.py + med_test3.py + med_test_grid.py + med_test_skin.py + medMeshing_test.py + med_field_anal.py + med_opfield_test.py + med_opsupp_test.py + test_gibi.py + test_porflow.py + testDriverAscii.py + testGaussLocalization.py + test_profil_MedFieldDriver.py + testWriteAndFam.py + testMedMemGeneral.py + testMedMemCxxTests.py + dumpMEDMEM.py + ensightMedEnsight_test.py + medEnsightMed_test.py + medNumPy_test.py + med2sauv + sauv2med + avs2med +) +INSTALL(FILES ${SCRIPTS} DESTINATION ${MED_salomescript_PYTHON} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt index 90ff170f0..726e79780 100644 --- a/src/MEDPartitioner/CMakeLists.txt +++ b/src/MEDPartitioner/CMakeLists.txt @@ -17,18 +17,20 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(Test) +IF(CPPUNIT_IS_OK) + ADD_SUBDIRECTORY(Test) +ENDIF(CPPUNIT_IS_OK) 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} + ${METIS_INCLUDE_DIRS} + ${LIBXML_INCLUDE_DIRS} + ${MED3_INCLUDE_DIRS} + ${HDF5_INCLUDE_DIRS} + ${MPI_INCLUDE_DIRS} + ${PTHREADS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/../MEDLoader ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL @@ -69,58 +71,59 @@ SET(medpartitionercpp_SOURCES MEDPARTITIONER_SkyLineArray.cxx ) -SET(medpartitionercpp_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${BOOST_FLAGS} ${LIBXML_FLAGS}") -SET(medpartitionercpp_LDFLAGS medloader ${LIBXML_LIBS}) - -IF(MED_ENABLE_SCOTCH) - SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_ScotchGraph.cxx) - SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_ScotchGraph.hxx) - SET(medpartitionercpp_FLAGS "${medpartitionercpp_FLAGS} ${SCOTCH_FLAGS}") - SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${SCOTCH_LIBS}) -ENDIF(MED_ENABLE_SCOTCH) - -IF(MPI_IS_OK) - IF(MED_ENABLE_PARMETIS) - SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_ParMetisGraph.cxx - MEDPARTITIONER_UtilsPara.cxx - MEDPARTITIONER_JointFinder.cxx - ) - SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_JointFinder.hxx MEDPARTITIONER_MetisGraph.hxx) - SET(medpartitionercpp_FLAGS "${medpartitionercpp_FLAGS} ${MPI_FLAGS} ${PARMETIS_FLAGS}") - SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${PARMETIS_LIBS} ${MPI_LIBS}) - ELSE(MED_ENABLE_PARMETIS) - SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} - MEDPARTITIONER_UtilsPara.cxx - MEDPARTITIONER_JointFinder.cxx - ) - SET(medpartitionercpp_FLAGS "${medpartitionercpp_FLAGS} ${MPI_FLAGS}") - SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${MPI_LIBS}) - ENDIF(MED_ENABLE_PARMETIS) -ELSE(MPI_IS_OK) +SET(medpartitionercpp_DEFINITIONS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${LIBXML_DEFINITIONS} ${MPI_DEFINITIONS}") +SET(medpartitionercpp_LDFLAGS + ${MED3_LIBS_C_ONLY} + ${HDF5_LIBS} + ${STDLIB} + ${LIBXML_LIBS} + ${MPI_LIBS} + interpkernel + medcoupling + medloader +) +IF(MED_ENABLE_PARMETIS) + SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_MetisGraph.hxx) + SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_ParMetisGraph.cxx) + SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${PARMETIS_DEFINITIONS}") + SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${PARMETIS_LIBS}) +ELSE(MED_ENABLE_PARMETIS) IF(MED_ENABLE_METIS) + SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_MetisGraph.hxx) SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_MetisGraph.cxx) - SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_MetisGraph.hxx) - SET(medpartitionercpp_FLAGS "${medpartitionercpp_FLAGS} ${METIS_FLAGS}") + SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${METIS_DEFINITIONS}") SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${METIS_LIBS}) ENDIF(MED_ENABLE_METIS) -ENDIF(MPI_IS_OK) - - + IF(MED_ENABLE_SCOTCH) + SET(medpartitionercpp_HEADERS_HXX ${medpartitionercpp_HEADERS_HXX} MEDPARTITIONER_ScotchGraph.hxx) + SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} MEDPARTITIONER_ScotchGraph.cxx) + SET(medpartitionercpp_DEFINITIONS "${medpartitionercpp_DEFINITIONS} ${SCOTCH_DEFINITIONS}") + SET(medpartitionercpp_LDFLAGS ${medpartitionercpp_LDFLAGS} ${SCOTCH_LIBS}) + ENDIF(MED_ENABLE_SCOTCH) +ENDIF(MED_ENABLE_PARMETIS) + IF(MPI_IS_OK) + SET(medpartitionercpp_SOURCES ${medpartitionercpp_SOURCES} + MEDPARTITIONER_UtilsPara.cxx + MEDPARTITIONER_JointFinder.cxx + ) +ENDIF(MPI_IS_OK) + +ADD_LIBRARY(medpartitionercpp SHARED ${medpartitionercpp_SOURCES}) +SET_TARGET_PROPERTIES(medpartitionercpp PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS} ${medpartitionercpp_DEFINITIONS}") +TARGET_LINK_LIBRARIES(medpartitionercpp ${medpartitionercpp_LDFLAGS} ${PLATFORM_LIBS} ${PTHREAD_LIBS}) +INSTALL(TARGETS medpartitionercpp DESTINATION ${MED_salomelib_LIBS}) + +IF(MED_ENABLE_PARMETIS) ADD_EXECUTABLE(medpartitioner_para medpartitioner_para.cxx) - SET_TARGET_PROPERTIES(medpartitioner_para PROPERTIES COMPILE_FLAGS "${medpartitionercpp_FLAGS}") - TARGET_LINK_LIBRARIES(medpartitioner_para medpartitionercpp) + SET_TARGET_PROPERTIES(medpartitioner_para PROPERTIES COMPILE_FLAGS "${medpartitionercpp_DEFINITIONS}") + TARGET_LINK_LIBRARIES(medpartitioner_para medpartitionercpp ${medpartitionercpp_LDFLAGS}) INSTALL(TARGETS medpartitioner_para DESTINATION ${MED_salomebin_BINS}) -ELSE(MPI_IS_OK) +ELSE(MED_ENABLE_PARMETIS) ADD_EXECUTABLE(medpartitioner medpartitioner.cxx) - SET_TARGET_PROPERTIES(medpartitioner PROPERTIES COMPILE_FLAGS "${medpartitionercpp_FLAGS}") - TARGET_LINK_LIBRARIES(medpartitioner medpartitionercpp) - INSTALL(TARGETS medpartitionerr DESTINATION ${MED_salomebin_BINS}) -ENDIF(MPI_IS_OK) - -ADD_LIBRARY(medpartitionercpp SHARED ${medpartitionercpp_SOURCES}) -SET_TARGET_PROPERTIES(medpartitionercpp PROPERTIES COMPILE_FLAGS "${medpartitionercpp_FLAGS}") -TARGET_LINK_LIBRARIES(medpartitionercpp ${medpartitionercpp_LDFLAGS}) -INSTALL(TARGETS medpartitionercpp DESTINATION ${MED_salomelib_LIBS}) + SET_TARGET_PROPERTIES(medpartitioner PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS} ${medpartitionercpp_DEFINITIONS}") + TARGET_LINK_LIBRARIES(medpartitioner medpartitionercpp ${medpartitionercpp_LDFLAGS}) + INSTALL(TARGETS medpartitioner DESTINATION ${MED_salomebin_BINS}) +ENDIF(MED_ENABLE_PARMETIS) INSTALL(FILES ${medpartitionercpp_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) diff --git a/src/MEDPartitioner/MEDPARTITIONER.hxx b/src/MEDPartitioner/MEDPARTITIONER.hxx index 87310b46a..bbf02c247 100755 --- a/src/MEDPartitioner/MEDPARTITIONER.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER.hxx @@ -21,13 +21,13 @@ #define __MEDPARTITIONER_HXX__ #ifdef WIN32 -# if defined MEDPARTITIONER_EXPORTS || defined medpartitioner_EXPORTS -# define MEDPARTITIONER_EXPORT __declspec( dllexport ) +# if defined MEDPARTITIONERCPP_EXPORTS || defined medpartitionercpp_EXPORTS +# define MEDPARTITIONERCPP_EXPORT __declspec( dllexport ) # else -# define MEDPARTITIONER_EXPORT __declspec( dllimport ) +# define MEDPARTITIONERCPP_EXPORT __declspec( dllimport ) # endif #else -# define MEDPARTITIONER_EXPORT +# define MEDPARTITIONERCPP_EXPORT #endif #endif diff --git a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx index 713216e92..601d6457f 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ConnectZone.hxx @@ -29,7 +29,7 @@ namespace MEDPARTITIONER { - class MEDPARTITIONER_EXPORT ConnectZone + class MEDPARTITIONERCPP_EXPORT ConnectZone { public : ConnectZone(); diff --git a/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx b/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx index 71e06d3a4..5ed55ec74 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_Graph.hxx @@ -28,7 +28,7 @@ namespace MEDPARTITIONER { class ParaDomainSelector; - class MEDPARTITIONER_EXPORT Graph + class MEDPARTITIONERCPP_EXPORT Graph { public: typedef enum {METIS,SCOTCH} splitter_type; diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx index 4ff58ddd6..ac10e279b 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.hxx @@ -48,7 +48,7 @@ namespace MEDPARTITIONER typedef std::multimap, std::pair > NodeMapping ; typedef std::vector > NodeList; - class MEDPARTITIONER_EXPORT MeshCollection + class MEDPARTITIONERCPP_EXPORT MeshCollection { public: MeshCollection(); diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx index af6a8758a..b82bc6a48 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.hxx @@ -30,7 +30,7 @@ namespace MEDPARTITIONER class MeshCollection; class ParaDomainSelector; - class MEDPARTITIONER_EXPORT MeshCollectionDriver + class MEDPARTITIONERCPP_EXPORT MeshCollectionDriver { public: MeshCollectionDriver(MeshCollection*); diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.hxx b/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.hxx index cfe465a9a..fd8caba4e 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.hxx @@ -38,7 +38,7 @@ namespace MEDPARTITIONER /*! * \brief Communication helper in parallel mode */ - class MEDPARTITIONER_EXPORT ParaDomainSelector + class MEDPARTITIONERCPP_EXPORT ParaDomainSelector { public: ParaDomainSelector(bool mesure_memory=false); diff --git a/src/MEDPartitioner/MEDPARTITIONER_SkyLineArray.hxx b/src/MEDPartitioner/MEDPARTITIONER_SkyLineArray.hxx index 32574736e..a4b642b84 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_SkyLineArray.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_SkyLineArray.hxx @@ -26,7 +26,7 @@ namespace MEDPARTITIONER { - class MEDPARTITIONER_EXPORT SkyLineArray + class MEDPARTITIONERCPP_EXPORT SkyLineArray { private: std::vector _index; diff --git a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx index 160940347..e8d109e6d 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx @@ -29,7 +29,7 @@ namespace MEDPARTITIONER { class SkyLineArray; class ParaDomainSelector; - class MEDPARTITIONER_EXPORT UserGraph : public Graph + class MEDPARTITIONERCPP_EXPORT UserGraph : public Graph { public: UserGraph(MEDPARTITIONER::SkyLineArray*, const int*, int); diff --git a/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx b/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx index 02b74cf28..9f245472b 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx +++ b/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx @@ -32,48 +32,48 @@ namespace MEDPARTITIONER { - MEDPARTITIONER_EXPORT std::string Trim(const std::string& s,const std::string& drop); - MEDPARTITIONER_EXPORT std::string IntToStr(const int i); - MEDPARTITIONER_EXPORT std::string DoubleToStr(const double i); - MEDPARTITIONER_EXPORT int StrToInt(const std::string& s); - MEDPARTITIONER_EXPORT double StrToDouble(const std::string& s); - MEDPARTITIONER_EXPORT bool TestArg(const char *arg, const char *argExpected, std::string& argValue); - MEDPARTITIONER_EXPORT std::vector CreateRandomSize(const int size); - MEDPARTITIONER_EXPORT void RandomizeAdj(int* xadj, int* adjncy, std::vector& ran, std::vector& vx, std::vector& va); - MEDPARTITIONER_EXPORT void TestRandomize(); + MEDPARTITIONERCPP_EXPORT std::string Trim(const std::string& s,const std::string& drop); + MEDPARTITIONERCPP_EXPORT std::string IntToStr(const int i); + MEDPARTITIONERCPP_EXPORT std::string DoubleToStr(const double i); + MEDPARTITIONERCPP_EXPORT int StrToInt(const std::string& s); + MEDPARTITIONERCPP_EXPORT double StrToDouble(const std::string& s); + MEDPARTITIONERCPP_EXPORT bool TestArg(const char *arg, const char *argExpected, std::string& argValue); + MEDPARTITIONERCPP_EXPORT std::vector CreateRandomSize(const int size); + MEDPARTITIONERCPP_EXPORT void RandomizeAdj(int* xadj, int* adjncy, std::vector& ran, std::vector& vx, std::vector& va); + MEDPARTITIONERCPP_EXPORT void TestRandomize(); - MEDPARTITIONER_EXPORT std::string ReprVectorOfString(const std::vector& vec); - MEDPARTITIONER_EXPORT std::string ReprVectorOfString(const std::vector& vec, const std::string separator); - MEDPARTITIONER_EXPORT std::string ReprMapOfStringInt(const std::map& mymap); - MEDPARTITIONER_EXPORT std::string ReprMapOfStringVectorOfString(const std::map< std::string,std::vector >& mymap); - MEDPARTITIONER_EXPORT std::string ReprFieldDescriptions(const std::vector& vec,const std::string separator); + MEDPARTITIONERCPP_EXPORT std::string ReprVectorOfString(const std::vector& vec); + MEDPARTITIONERCPP_EXPORT std::string ReprVectorOfString(const std::vector& vec, const std::string separator); + MEDPARTITIONERCPP_EXPORT std::string ReprMapOfStringInt(const std::map& mymap); + MEDPARTITIONERCPP_EXPORT std::string ReprMapOfStringVectorOfString(const std::map< std::string,std::vector >& mymap); + MEDPARTITIONERCPP_EXPORT std::string ReprFieldDescriptions(const std::vector& vec,const std::string separator); - MEDPARTITIONER_EXPORT std::string SerializeFromString(const std::string& s); - MEDPARTITIONER_EXPORT std::string SerializeFromVectorOfString(const std::vector& vec); - MEDPARTITIONER_EXPORT std::vector DeserializeToVectorOfString(const std::string& str); - MEDPARTITIONER_EXPORT std::string EraseTagSerialized(const std::string& fromStr, const std::string& tag); + MEDPARTITIONERCPP_EXPORT std::string SerializeFromString(const std::string& s); + MEDPARTITIONERCPP_EXPORT std::string SerializeFromVectorOfString(const std::vector& vec); + MEDPARTITIONERCPP_EXPORT std::vector DeserializeToVectorOfString(const std::string& str); + MEDPARTITIONERCPP_EXPORT std::string EraseTagSerialized(const std::string& fromStr, const std::string& tag); - MEDPARTITIONER_EXPORT std::vector VectorizeFromMapOfStringInt(const std::map& mymap); - MEDPARTITIONER_EXPORT std::map DevectorizeToMapOfStringInt(const std::vector& vec); + MEDPARTITIONERCPP_EXPORT std::vector VectorizeFromMapOfStringInt(const std::map& mymap); + MEDPARTITIONERCPP_EXPORT std::map DevectorizeToMapOfStringInt(const std::vector& vec); - MEDPARTITIONER_EXPORT std::vector VectorizeFromMapOfStringVectorOfString(const std::map< std::string,std::vector >& mymap); - MEDPARTITIONER_EXPORT std::map< std::string,std::vector > DevectorizeToMapOfStringVectorOfString(const std::vector& vec); + MEDPARTITIONERCPP_EXPORT std::vector VectorizeFromMapOfStringVectorOfString(const std::map< std::string,std::vector >& mymap); + MEDPARTITIONERCPP_EXPORT std::map< std::string,std::vector > DevectorizeToMapOfStringVectorOfString(const std::vector& vec); - MEDPARTITIONER_EXPORT std::vector SelectTagsInVectorOfString(const std::vector& vec, const std::string tag); - MEDPARTITIONER_EXPORT std::vector DeleteDuplicatesInVectorOfString(const std::vector& vec); - MEDPARTITIONER_EXPORT std::map< std::string,std::vector > DeleteDuplicatesInMapOfStringVectorOfString(const std::map< std::string,std::vector >& mymap); + MEDPARTITIONERCPP_EXPORT std::vector SelectTagsInVectorOfString(const std::vector& vec, const std::string tag); + MEDPARTITIONERCPP_EXPORT std::vector DeleteDuplicatesInVectorOfString(const std::vector& vec); + MEDPARTITIONERCPP_EXPORT std::map< std::string,std::vector > DeleteDuplicatesInMapOfStringVectorOfString(const std::map< std::string,std::vector >& mymap); - MEDPARTITIONER_EXPORT std::string Cle1ToStr(const std::string& s, const int inew); - MEDPARTITIONER_EXPORT void Cle1ToData(const std::string& cle, std::string& s, int& inew); + MEDPARTITIONERCPP_EXPORT std::string Cle1ToStr(const std::string& s, const int inew); + MEDPARTITIONERCPP_EXPORT void Cle1ToData(const std::string& cle, std::string& s, int& inew); - MEDPARTITIONER_EXPORT std::string Cle2ToStr(const std::string& s,const int inew,const int iold); - MEDPARTITIONER_EXPORT void Cle2ToData(const std::string& cle, std::string& s, int& inew, int& iold); + MEDPARTITIONERCPP_EXPORT std::string Cle2ToStr(const std::string& s,const int inew,const int iold); + MEDPARTITIONERCPP_EXPORT void Cle2ToData(const std::string& cle, std::string& s, int& inew, int& iold); - MEDPARTITIONER_EXPORT std::string ExtractFromDescription(const std::string& description,const std::string& tag); - MEDPARTITIONER_EXPORT void FieldDescriptionToData(const std::string& description, + MEDPARTITIONERCPP_EXPORT std::string ExtractFromDescription(const std::string& description,const std::string& tag); + MEDPARTITIONERCPP_EXPORT void FieldDescriptionToData(const std::string& description, int& idomain, std::string& fileName, std::string& meshName, std::string& fieldName, int& typeField, int& DT, int& IT); - MEDPARTITIONER_EXPORT void FieldShortDescriptionToData(const std::string& description, + MEDPARTITIONERCPP_EXPORT void FieldShortDescriptionToData(const std::string& description, std::string& fieldName, int& typeField, int& entity, int& DT, int& IT); ParaMEDMEM::DataArrayInt *CreateDataArrayIntFromVector(const std::vector& v); @@ -92,8 +92,8 @@ namespace MEDPARTITIONER //void SendVectorOfString(const std::vector& vec, const int target); //std::vector RecvVectorOfString(const int source); //TODO void sendRecvVectorOfString(const std::vector& vec, const int source, const int target); - MEDPARTITIONER_EXPORT std::vector SendAndReceiveVectorOfString(const std::vector& vec, const int source, const int target); - MEDPARTITIONER_EXPORT std::vector AllgathervVectorOfString(const std::vector& vec); + MEDPARTITIONERCPP_EXPORT std::vector SendAndReceiveVectorOfString(const std::vector& vec, const int source, const int target); + MEDPARTITIONERCPP_EXPORT std::vector AllgathervVectorOfString(const std::vector& vec); void SendDoubleVec(const std::vector& vec, const int target); std::vector *RecvDoubleVec(const int source); @@ -117,7 +117,7 @@ namespace MEDPARTITIONER void TestPersistantMpiRingOnCommSplit(int taille, int nb); #endif - class MEDPARTITIONER_EXPORT MyGlobals + class MEDPARTITIONERCPP_EXPORT MyGlobals { public : static int _Verbose; //0 to 1000 over 200 is debug diff --git a/src/MEDPartitioner/Test/CMakeLists.txt b/src/MEDPartitioner/Test/CMakeLists.txt index 8e2b10f54..ee2bc2143 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} + ${CPPUNIT_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 @@ -46,31 +46,31 @@ SET(MEDPARTITIONERTest_SOURCES MEDPARTITIONERTest.cxx ) -SET(MEDPARTITIONERTest_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${BOOST_FLAGS} ${LIBXML_FLAGS} ${CPPUNIT_FLAGS}") +SET(MEDPARTITIONERTest_DEFINITIONS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${LIBXML_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${PLATFORM_DEFINITIONS}") SET(MEDPARTITIONERTest_LDFLAGS medpartitionercpp ${CPPUNIT_LIBS}) IF(MED_ENABLE_SCOTCH) - SET(MEDPARTITIONERTest_FLAGS "${MEDPARTITIONERTest_FLAGS} ${SCOTCH_FLAGS}") + SET(MEDPARTITIONERTest_DEFINITIONS "${MEDPARTITIONERTest_DEFINITIONS} ${SCOTCH_DEFINITIONS}") ENDIF(MED_ENABLE_SCOTCH) IF(MPI_IS_OK) IF(MED_ENABLE_PARMETIS) SET(MEDPARTITIONERTest_SOURCES ${MEDPARTITIONERTest_SOURCES} MEDPARTITIONERTestPara.cxx) - SET(MEDPARTITIONERTest_FLAGS "${MEDPARTITIONERTest_FLAGS} ${MPI_FLAGS} ${PARMETIS_FLAGS}") + SET(MEDPARTITIONERTest_DEFINITIONS "${MEDPARTITIONERTest_DEFINITIONS} ${MPI_DEFINITIONS} ${PARMETIS_DEFINITIONS}") ENDIF(MED_ENABLE_PARMETIS) ELSE(MPI_IS_OK) IF(MED_ENABLE_METIS) - SET(MEDPARTITIONERTest_FLAGS "${MEDPARTITIONERTest_FLAGS} ${METIS_FLAGS}") + SET(MEDPARTITIONERTest_DEFINITIONS "${MEDPARTITIONERTest_DEFINITIONS} ${METIS_DEFINITIONS}") ENDIF(MED_ENABLE_METIS) ENDIF(MPI_IS_OK) ADD_LIBRARY(MEDPARTITIONERTest SHARED ${MEDPARTITIONERTest_SOURCES}) -SET_TARGET_PROPERTIES(MEDPARTITIONERTest PROPERTIES COMPILE_FLAGS "${MEDPARTITIONERTest_FLAGS}") +SET_TARGET_PROPERTIES(MEDPARTITIONERTest PROPERTIES COMPILE_FLAGS "${MEDPARTITIONERTest_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDPARTITIONERTest ${MEDPARTITIONERTest_LDFLAGS}) INSTALL(TARGETS MEDPARTITIONERTest DESTINATION ${MED_salomelib_LIBS}) ADD_EXECUTABLE(TestMEDPARTITIONER TestMEDPARTITIONER.cxx) -SET_TARGET_PROPERTIES(TestMEDPARTITIONER PROPERTIES COMPILE_FLAGS "${MEDPARTITIONERTest_FLAGS}") +SET_TARGET_PROPERTIES(TestMEDPARTITIONER PROPERTIES COMPILE_FLAGS "${MEDPARTITIONERTest_DEFINITIONS}") TARGET_LINK_LIBRARIES(TestMEDPARTITIONER MEDPARTITIONERTest) INSTALL(TARGETS TestMEDPARTITIONER DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MEDSPLITTER/CMakeLists.txt b/src/MEDSPLITTER/CMakeLists.txt index 3cc23b634..f1d5bea64 100644 --- a/src/MEDSPLITTER/CMakeLists.txt +++ b/src/MEDSPLITTER/CMakeLists.txt @@ -17,23 +17,23 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(Test) - +IF(CPPUNIT_IS_OK) + ADD_SUBDIRECTORY(Test) +ENDIF(CPPUNIT_IS_OK) + 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 - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D - ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/ExprEval ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/GaussPoints ) @@ -74,47 +74,55 @@ SET(medsplittercpp_SOURCES MEDSPLITTER_JointExchangeData.cxx ) -SET(medsplittercpp_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${BOOST_FLAGS} ${LIBXML_FLAGS}") -SET(medsplittercpp_LDFLAGS medmem ${LIBXML_LIBS}) +SET(medsplittercpp_DEFINITIONS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${LIBXML_DEFINITIONS} ${MPI_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +SET(medsplittercpp_LDFLAGS medmem ${LIBXML_LIBS} interpkernel ${MPI_LIBS} ${HDF5_LIBS} ${MED3_LIBS_C_ONLY} ${STDLIB} ${PLATFORM_LIBS}) IF(MED_ENABLE_SCOTCH) SET(medsplittercpp_SOURCES ${medsplittercpp_SOURCES} MEDSPLITTER_SCOTCHGraph.cxx) SET(medsplittercpp_HEADERS_HXX ${medsplittercpp_HEADERS_HXX} MEDSPLITTER_SCOTCHGraph.hxx) - SET(medsplittercpp_FLAGS "${medsplittercpp_FLAGS} ${SCOTCH_FLAGS}") + SET(medsplittercpp_DEFINITIONS "${medsplittercpp_DEFINITIONS} ${SCOTCH_DEFINITIONS}") SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${SCOTCH_LIBS}) ENDIF(MED_ENABLE_SCOTCH) +IF(MED_ENABLE_METIS) + SET(medsplittercpp_HEADERS_HXX ${medsplittercpp_HEADERS_HXX} MEDSPLITTER_METISGraph.hxx) +ENDIF(MED_ENABLE_METIS) + IF(MPI_IS_OK) IF(MED_ENABLE_PARMETIS) SET(medsplittercpp_SOURCES ${medsplittercpp_SOURCES} MEDSPLITTER_METISGraph.cxx) - SET(medsplittercpp_HEADERS_HXX ${medsplittercpp_HEADERS_HXX} MEDSPLITTER_METISGraph.hxx) - SET(medsplittercpp_FLAGS "${medsplittercpp_FLAGS} ${MPI_FLAGS} ${PARMETIS_FLAGS}") - SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${PARMETIS_LIBS} ${MPI_LIBS}) + SET(medsplittercpp_DEFINITIONS "${medsplittercpp_DEFINITIONS} ${MPI_DEFINITIONS} ${PARMETIS_DEFINITIONS}") + SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${PARMETIS_LIBS}) ENDIF(MED_ENABLE_PARMETIS) ELSE(MPI_IS_OK) IF(MED_ENABLE_METIS) SET(medsplittercpp_SOURCES ${medsplittercpp_SOURCES} MEDSPLITTER_METISGraph.cxx) - SET(medsplittercpp_HEADERS_HXX ${medsplittercpp_HEADERS_HXX} MEDSPLITTER_METISGraph.hxx) - SET(medsplittercpp_FLAGS "${medsplittercpp_FLAGS} ${METIS_FLAGS}") + SET(medsplittercpp_DEFINITIONS "${medsplittercpp_DEFINITIONS} ${METIS_DEFINITIONS}") SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${METIS_LIBS}) ENDIF(MED_ENABLE_METIS) ENDIF(MPI_IS_OK) +SET(medsplitter_LDFLAGS ${medsplittercpp_LDFLAGS}) +IF(MED_ENABLE_KERNEL) + INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) + SET(medsplittercpp_LDFLAGS ${medsplittercpp_LDFLAGS} ${BOSST_LIBS} ${SALOMELocalTrace}) + SET(medsplitter_LDFLAGS ${medsplittercpp_LDFLAGS} ${SALOMEBasics}) +ENDIF(MED_ENABLE_KERNEL) + +ADD_EXECUTABLE(medsplitter medsplitter.cxx) +SET_TARGET_PROPERTIES(medsplitter PROPERTIES COMPILE_FLAGS "${medsplittercpp_DEFINITIONS}") +TARGET_LINK_LIBRARIES(medsplitter medsplittercpp ${medsplitter_LDFLAGS}) +INSTALL(TARGETS medsplitter DESTINATION ${MED_salomebin_BINS}) IF(MPI_IS_OK) ADD_EXECUTABLE(medsplitter_para medsplitter_para.cxx) - SET_TARGET_PROPERTIES(medsplitter_para PROPERTIES COMPILE_FLAGS "${medsplittercpp_FLAGS}") - TARGET_LINK_LIBRARIES(medsplitter_para medsplittercpp) + SET_TARGET_PROPERTIES(medsplitter_para PROPERTIES COMPILE_FLAGS "${medsplittercpp_DEFINITIONS}") + TARGET_LINK_LIBRARIES(medsplitter_para medsplittercpp ${medsplitter_LDFLAGS}) INSTALL(TARGETS medsplitter_para DESTINATION ${MED_salomebin_BINS}) -ELSE(MPI_IS_OK) - ADD_EXECUTABLE(medsplitter medsplitter.cxx) - SET_TARGET_PROPERTIES(medsplitter PROPERTIES COMPILE_FLAGS "${medsplittercpp_FLAGS}") - TARGET_LINK_LIBRARIES(medsplitter medsplittercpp) - INSTALL(TARGETS medsplitter DESTINATION ${MED_salomebin_BINS}) ENDIF(MPI_IS_OK) ADD_LIBRARY(medsplittercpp SHARED ${medsplittercpp_SOURCES}) -SET_TARGET_PROPERTIES(medsplittercpp PROPERTIES COMPILE_FLAGS "${medsplittercpp_FLAGS}") +SET_TARGET_PROPERTIES(medsplittercpp PROPERTIES COMPILE_FLAGS "${medsplittercpp_DEFINITIONS}") TARGET_LINK_LIBRARIES(medsplittercpp ${medsplittercpp_LDFLAGS}) INSTALL(TARGETS medsplittercpp DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDSPLITTER/Test/CMakeLists.txt b/src/MEDSPLITTER/Test/CMakeLists.txt index 6a2e5adea..387b3bb74 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} + ${CPPUNIT_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 @@ -35,63 +35,83 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/Geometric2D ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/ExprEval ${CMAKE_CURRENT_SOURCE_DIR}/../../INTERP_KERNEL/GaussPoints - ) +) SET(MEDSPLITTERTest_HEADERS_HXX MEDSPLITTERTest.hxx MEDSPLITTERTest_Utils.hxx MEDSPLITTERTest_defs.hxx - ) +) SET(MEDSPLITTERTest_SOURCES MEDSPLITTERTest.cxx MEDSPLITTERTest_MESHCollection.cxx MEDSPLITTERTest_ParallelTopology.cxx MEDSPLITTERTest_Utils.cxx - ) +) -SET(MEDSPLITTERTest_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${BOOST_FLAGS} ${LIBXML_FLAGS} ${CPPUNIT_FLAGS}") -SET(MEDSPLITTERTest_LDFLAGS medsplittercpp ${CPPUNIT_LIBS}) - -IF(MED_ENABLE_SCOTCH) - SET(MEDSPLITTERTest_FLAGS "${MEDSPLITTERTest_FLAGS} ${SCOTCH_FLAGS}") -ENDIF(MED_ENABLE_SCOTCH) +SET(MEDSPLITTERTest_DEFINITIONS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${LIBXML_DEFINITIONS} ${CPPUNIT_DEFINITIONS} ${MPI_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +SET(MEDSPLITTERTest_LDFLAGS ${CPPUNIT_LIBS} ${MED3_LIBS_C_ONLY} medsplittercpp) -IF(MPI_IS_OK) +IF(MED_ENABLE_PARMETIS) SET(MEDSPLITTERTest_SOURCES ${MEDSPLITTERTest_SOURCES} ParaMEDSPLITTERTest_MeshSendReceive.cxx ParaMEDSPLITTERTest_ParaDomainSelector.cxx ParaMEDSPLITTERTest_medsplitter_para.cxx - ) - SET(MEDSPLITTERTest_HEADERS_HXX ${MEDSPLITTERTest_HEADERS_HXX} ParaMEDSPLITTERTest.hxx) - IF(MED_ENABLE_PARMETIS) - SET(MEDSPLITTERTest_FLAGS "${MEDSPLITTERTest_FLAGS} ${MPI_FLAGS} ${PARMETIS_FLAGS}") - ENDIF(MED_ENABLE_PARMETIS) -ELSE(MPI_IS_OK) - IF(MED_ENABLE_METIS) - SET(MEDSPLITTERTest_FLAGS "${MEDSPLITTERTest_FLAGS} ${METIS_FLAGS}") - ENDIF(MED_ENABLE_METIS) -ENDIF(MPI_IS_OK) + ParaMEDSPLITTERTest.hxx + ) + SET(MEDSPLITTERTest_DEFINITIONS "${MEDSPLITTERTest_DEFINITIONS} ${PARMETIS_DEFINITIONS}") + SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${PARMETIS_LIBS}) +ENDIF(MED_ENABLE_PARMETIS) + +IF(MED_ENABLE_METIS) + SET(MEDSPLITTERTest_DEFINITIONS "${MEDSPLITTERTest_DEFINITIONS} ${METIS_DEFINITIONS}") + SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${METIS_LIBS}) +ENDIF(MED_ENABLE_METIS) + +IF(MED_ENABLE_KERNEL) + INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) + SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${SALOMELocalTrace}) +ENDIF(MED_ENABLE_KERNEL) + +IF(MED_ENABLE_SCOTCH) + SET(MEDSPLITTERTest_DEFINITIONS "${MEDSPLITTERTest_DEFINITIONS} ${SCOTCH_DEFINITIONS}") + SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} ${SCOTCH_LIBS}) +ENDIF(MED_ENABLE_SCOTCH) + +SET(SCRIPTS testMEDSPLITTER.py) + IF(MPI_IS_OK) - ADD_EXECUTABLE(TestParaMEDSPLITTER TestParaMEDSPLITTER.cxx) - SET_TARGET_PROPERTIES(TestParaMEDSPLITTER PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_FLAGS}") - TARGET_LINK_LIBRARIES(TestParaMEDSPLITTER MEDSPLITTERTest) - INSTALL(TARGETS TestParaMEDSPLITTER DESTINATION ${MED_salomebin_BINS}) -ELSE(MPI_IS_OK) + IF(MED_ENABLE_PARMETIS) + SET(TestParaMEDSPLITTER_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} MEDSPLITTERTest med_V2_1 medmem interpkernel medsplitter) + SET(SCRIPTS ${SCRIPTS}testMEDSPLITTER.py) + + ADD_EXECUTABLE(TestParaMEDSPLITTER TestParaMEDSPLITTER.cxx) + SET_TARGET_PROPERTIES(TestParaMEDSPLITTER PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_DEFINITIONS}") + TARGET_LINK_LIBRARIES(TestParaMEDSPLITTER ${TestParaMEDSPLITTER_LDFLAGS}) + INSTALL(TARGETS TestParaMEDSPLITTER DESTINATION ${MED_salomebin_BINS}) + ENDIF(MED_ENABLE_PARMETIS) +ELSE(MPI_IS_OK) IF(MED_ENABLE_METIS) + SET(TestMEDSPLITTER_LDFLAGS ${MEDSPLITTERTest_LDFLAGSS} MEDSPLITTERTest med_V2_1 medmem interpkernel medsplitter) + IF(MED_ENABLE_KERNEL) + SET(MEDSPLITTERTest_LDFLAGS ${MEDSPLITTERTest_LDFLAGS} SALOMEBasics) + ENDIF(MED_ENABLE_KERNEL) + ADD_EXECUTABLE(TestMEDSPLITTER TestMEDSPLITTER.cxx) - SET_TARGET_PROPERTIES(TestMEDSPLITTER PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_FLAGS}") - TARGET_LINK_LIBRARIES(TestMEDSPLITTER MEDSPLITTERTest) + SET_TARGET_PROPERTIES(TestMEDSPLITTER PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_DEFINITIONS}") + TARGET_LINK_LIBRARIES(TestMEDSPLITTER ${TestMEDSPLITTER_LDFLAGS}) INSTALL(TARGETS TestMEDSPLITTER DESTINATION ${MED_salomebin_BINS}) ENDIF(MED_ENABLE_METIS) ENDIF(MPI_IS_OK) - + ADD_LIBRARY(MEDSPLITTERTest SHARED ${MEDSPLITTERTest_SOURCES}) -SET_TARGET_PROPERTIES(MEDSPLITTERTest PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_FLAGS}") +SET_TARGET_PROPERTIES(MEDSPLITTERTest PROPERTIES COMPILE_FLAGS "${MEDSPLITTERTest_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDSPLITTERTest ${MEDSPLITTERTest_LDFLAGS}) INSTALL(TARGETS MEDSPLITTERTest DESTINATION ${MED_salomelib_LIBS}) INSTALL(FILES ${MEDSPLITTERTest_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) +INSTALL(FILES ${SCRIPTS} DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MEDSPLITTER_Swig/CMakeLists.txt b/src/MEDSPLITTER_Swig/CMakeLists.txt index 14f1e76df..8cd10378d 100644 --- a/src/MEDSPLITTER_Swig/CMakeLists.txt +++ b/src/MEDSPLITTER_Swig/CMakeLists.txt @@ -17,18 +17,17 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(libMEDSPLITTER_Swig.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(libMEDSPLITTER_Swig.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libMEDSPLITTER_Swig.i PROPERTIES SWIG_DEFINITIONS "-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 @@ -41,11 +40,13 @@ INCLUDE_DIRECTORIES( ) SWIG_ADD_MODULE(libMEDSPLITTER_Swig python libMEDSPLITTER_Swig.i) -SWIG_LINK_LIBRARIES(libMEDSPLITTER_Swig ${PYTHON_LIBRARIES} medsplittercpp) -SET_TARGET_PROPERTIES(_libMEDSPLITTER_Swig PROPERTIES COMPILE_FLAGS "${BOOST_FLAGS}") - +SWIG_LINK_LIBRARIES(libMEDSPLITTER_Swig ${PYTHON_LIBS} medsplittercpp) +SET_TARGET_PROPERTIES(_libMEDSPLITTER_Swig PROPERTIES COMPILE_FLAGS "${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +IF(${MACHINE} STREQUAL WINDOWS) + SET_TARGET_PROPERTIES(_libMEDSPLITTER_Swig PROPERTIES DEBUG_OUTPUT_NAME _libMEDSPLITTER_Swig_d) +ENDIF(${MACHINE} STREQUAL WINDOWS) INSTALL(TARGETS _libMEDSPLITTER_Swig DESTINATION ${MED_salomepythondir}) INSTALL(FILES libMEDSPLITTER_Swig.i DESTINATION ${MED_salomeinclude_HEADERS}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libMEDSPLITTER_Swig.py MEDSPLITTER.py test_MEDSPLITTER.py DESTINATION ${MED_salomescript_PYTHON}) -INSTALL_AND_COMPILE_PYTHON_FILE(${CMAKE_CURRENT_SOURCE_DIR}/MEDSPLITTER.py ${MED_salomescript_PYTHON}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libMEDSPLITTER_Swig.py DESTINATION ${MED_salomepythondir}) +INSTALL(FILES MEDSPLITTER.py test_MEDSPLITTER.py DESTINATION ${MED_salomescript_DATA}) diff --git a/src/MEDWrapper/Base/CMakeLists.txt b/src/MEDWrapper/Base/CMakeLists.txt index 2e6cb5ab1..0de97a472 100644 --- a/src/MEDWrapper/Base/CMakeLists.txt +++ b/src/MEDWrapper/Base/CMakeLists.txt @@ -18,10 +18,15 @@ # INCLUDE_DIRECTORIES( - ${HDF5_INCLUDES_DIR} - ${BOOST_INCLUDES_DIR} - ${KERNEL_ROOT_DIR}/include/salome - ) + ${HDF5_INCLUDE_DIRS} + ${BOOST_INCLUDE_DIRS} +) + +IF(MED_ENABLE_KERNEL) + INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) +ELSE(MED_ENABLE_KERNEL) + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel) +ENDIF(MED_ENABLE_KERNEL) SET(MEDWrapperBase_SOURCES MED_Structures.cxx @@ -34,7 +39,7 @@ SET(MEDWrapperBase_SOURCES ) ADD_LIBRARY(MEDWrapperBase SHARED ${MEDWrapperBase_SOURCES}) -SET_TARGET_PROPERTIES(MEDWrapperBase PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_FLAGS} ${BOOST_FLAGS}") +SET_TARGET_PROPERTIES(MEDWrapperBase PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDWrapperBase ${BOOST_LIB_THREAD} ${BOOST_LIB_DATE_TIME}) INSTALL(TARGETS MEDWrapperBase DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDWrapper/Factory/CMakeLists.txt b/src/MEDWrapper/Factory/CMakeLists.txt index 5f0b15f91..2f9b3543a 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 @@ -29,26 +29,30 @@ INCLUDE_DIRECTORIES( IF(MED_ENABLE_KERNEL) INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) ELSE(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel/unix) + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel) ENDIF(MED_ENABLE_KERNEL) SET(MEDWrapper_SOURCES MED_Factory.cxx - ) +) SET(mprint_version_SOURCES mprint_version.cxx ) ADD_LIBRARY(MEDWrapper SHARED ${MEDWrapper_SOURCES}) -SET_TARGET_PROPERTIES(MEDWrapper PROPERTIES COMPILE_FLAGS "${BOOST_FLAGS} ${MED3_FLAGS}") -TARGET_LINK_LIBRARIES(MEDWrapper MEDWrapperBase MEDWrapper_V2_1 MEDWrapper_V2_2) +SET_TARGET_PROPERTIES(MEDWrapper PROPERTIES COMPILE_FLAGS "${BOOST_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(MEDWrapper MEDWrapper_V2_1 MEDWrapper_V2_2) INSTALL(TARGETS MEDWrapper DESTINATION ${MED_salomelib_LIBS}) ADD_EXECUTABLE(mprint_version ${mprint_version_SOURCES}) -SET_TARGET_PROPERTIES(mprint_version PROPERTIES COMPILE_FLAGS "${BOOST_FLAGS} ${MED3_FLAGS}") -TARGET_LINK_LIBRARIES(mprint_version MEDWrapper) +SET_TARGET_PROPERTIES(mprint_version PROPERTIES COMPILE_FLAGS "${BOOST_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(mprint_version MEDWrapper MEDWrapper_V2_1 MEDWrapper_V2_2 MEDWrapperBase med_V2_1 ${BOOST_LIBS} ${MED3_LIBS_C_ONLY}) + +ADD_EXECUTABLE(MED_Test ${mprint_version_SOURCES}) +SET_TARGET_PROPERTIES(MED_Test PROPERTIES COMPILE_FLAGS "${BOOST_DEFINITIONS} ${MED3_DEFINITIONS} ${PLATFORM_DEFINITIONS}") +TARGET_LINK_LIBRARIES(MED_Test MEDWrapper MEDWrapper_V2_1 MEDWrapper_V2_2 MEDWrapperBase med_V2_1 ${BOOST_LIBS}) FILE(GLOB MEDWrapper_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${MEDWrapper_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) -INSTALL(TARGETS mprint_version DESTINATION ${MED_salomebin_BINS}) \ No newline at end of file +INSTALL(TARGETS mprint_version MED_Test DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MEDWrapper/V2_1/Core/CMakeLists.txt b/src/MEDWrapper/V2_1/Core/CMakeLists.txt index 34d9ff3aa..9c80b777d 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 @@ -153,15 +153,15 @@ SET(test1_V2_1_SOURCES ) ADD_LIBRARY(med_V2_1 SHARED ${med_V2_1_SOURCES}) -SET_TARGET_PROPERTIES(med_V2_1 PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_FLAGS}") +SET_TARGET_PROPERTIES(med_V2_1 PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(med_V2_1 ${HDF5_LIBS}) INSTALL(TARGETS med_V2_1 DESTINATION ${MED_salomelib_LIBS}) ADD_EXECUTABLE(mdump_V2_1 ${mdump_V2_1_SOURCES}) -SET_TARGET_PROPERTIES(mdump_V2_1 PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_FLAGS}") +SET_TARGET_PROPERTIES(mdump_V2_1 PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(mdump_V2_1 med_V2_1) ADD_EXECUTABLE(test1_V2_1 ${mdump_V2_1_SOURCES}) -SET_TARGET_PROPERTIES(test1_V2_1 PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_FLAGS}") +SET_TARGET_PROPERTIES(test1_V2_1 PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${HDF5_DEFINITIONS}") TARGET_LINK_LIBRARIES(test1_V2_1 med_V2_1) INSTALL(TARGETS mdump_V2_1 test1_V2_1 DESTINATION ${MED_salomebin_BINS}) diff --git a/src/MEDWrapper/V2_1/Wrapper/CMakeLists.txt b/src/MEDWrapper/V2_1/Wrapper/CMakeLists.txt index 1d8f71c12..b6990e829 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 ) @@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES( IF(MED_ENABLE_KERNEL) INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) ELSE(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel/unix) + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel) ENDIF(MED_ENABLE_KERNEL) SET(MEDWrapper_V2_1_SOURCES @@ -35,7 +35,7 @@ SET(MEDWrapper_V2_1_SOURCES ) ADD_LIBRARY(MEDWrapper_V2_1 SHARED ${MEDWrapper_V2_1_SOURCES}) -SET_TARGET_PROPERTIES(MEDWrapper_V2_1 PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${BOOST_FLAGS} ${HDF5_FLAGS}") +SET_TARGET_PROPERTIES(MEDWrapper_V2_1 PROPERTIES COMPILE_FLAGS "-D${MACHINE} ${BOOST_DEFINITIONS} ${HDF5_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDWrapper_V2_1 med_V2_1 MEDWrapperBase) INSTALL(TARGETS MEDWrapper_V2_1 DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MEDWrapper/V2_2/CMakeLists.txt b/src/MEDWrapper/V2_2/CMakeLists.txt index dc3424c49..351584b2d 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 ) @@ -31,11 +31,11 @@ SET(MEDWrapper_V2_2_SOURCES IF(MED_ENABLE_KERNEL) INCLUDE_DIRECTORIES(${KERNEL_ROOT_DIR}/include/salome) ELSE(MED_ENABLE_KERNEL) - INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel/unix) + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/adm_local_without_kernel) ENDIF(MED_ENABLE_KERNEL) ADD_LIBRARY(MEDWrapper_V2_2 SHARED ${MEDWrapper_V2_2_SOURCES}) -SET_TARGET_PROPERTIES(MEDWrapper_V2_2 PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${BOOST_FLAGS}") +SET_TARGET_PROPERTIES(MEDWrapper_V2_2 PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDWrapper_V2_2 MEDWrapperBase ${MED3_LIBS_C_ONLY} ${HDF5_LIBS}) INSTALL(TARGETS MEDWrapper_V2_2 DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/MedClient/src/CMakeLists.txt b/src/MedClient/src/CMakeLists.txt index 19438c548..321566bf6 100644 --- a/src/MedClient/src/CMakeLists.txt +++ b/src/MedClient/src/CMakeLists.txt @@ -17,16 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) +INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake) 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} @@ -41,7 +41,7 @@ INCLUDE_DIRECTORIES( ) SET_SOURCE_FILES_PROPERTIES(libMEDClient.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(libMEDClient.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libMEDClient.i PROPERTIES SWIG_DEFINITIONS "-shadow") SET(MEDClientcmodule_SOURCES COORDINATEClient.cxx @@ -55,13 +55,13 @@ SET(MEDClientcmodule_SOURCES ADD_LIBRARY(MEDClientcmodule SHARED ${MEDClientcmodule_SOURCES}) INSTALL(FILES libMEDClient.i DESTINATION ${MED_salomeinclude_HEADERS}) -SET_TARGET_PROPERTIES(MEDClientcmodule PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS} ${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") +SET_TARGET_PROPERTIES(MEDClientcmodule PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS}") TARGET_LINK_LIBRARIES(MEDClientcmodule MEDMEMImpl MEDEngine) INSTALL(TARGETS MEDClientcmodule DESTINATION ${MED_salomelib_LIBS}) SWIG_ADD_MODULE(libMEDClient python libMEDClient.i) -SWIG_LINK_LIBRARIES(libMEDClient ${PYTHON_LIBRARIES} MEDClientcmodule) -SET_TARGET_PROPERTIES(_libMEDClient PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS} ${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") +SWIG_LINK_LIBRARIES(libMEDClient ${PYTHON_LIBS} MEDClientcmodule) +SET_TARGET_PROPERTIES(_libMEDClient PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS}") INSTALL(TARGETS _libMEDClient DESTINATION ${MED_salomepythondir}) INSTALL_AND_COMPILE_PYTHON_FILE(${CMAKE_CURRENT_BINARY_DIR}/libMEDClient.py ${MED_salomescript_PYTHON}) diff --git a/src/MedClient/test/test2/CMakeLists.txt b/src/MedClient/test/test2/CMakeLists.txt index 496938fd1..78acdc31d 100644 --- a/src/MedClient/test/test2/CMakeLists.txt +++ b/src/MedClient/test/test2/CMakeLists.txt @@ -17,16 +17,16 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) +INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake) 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} @@ -42,11 +42,11 @@ INCLUDE_DIRECTORIES( ) SET_SOURCE_FILES_PROPERTIES(libCompo2.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(libCompo2.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libCompo2.i PROPERTIES SWIG_DEFINITIONS "-shadow") SWIG_ADD_MODULE(libCompo2 python libCompo2.i Compo2.cxx) -SWIG_LINK_LIBRARIES(libCompo2 ${PYTHON_LIBRARIES} MEDClientcmodule) -SET_TARGET_PROPERTIES(_libCompo2 PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS} ${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") +SWIG_LINK_LIBRARIES(libCompo2 ${PYTHON_LIBS} MEDClientcmodule) +SET_TARGET_PROPERTIES(_libCompo2 PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS}") INSTALL(TARGETS _libCompo2 DESTINATION ${MED_salomepythondir}) INSTALL_AND_COMPILE_PYTHON_FILE(${CMAKE_CURRENT_BINARY_DIR}/libCompo2.py ${MED_salomescript_PYTHON}) diff --git a/src/MedCorba_Swig/CMakeLists.txt b/src/MedCorba_Swig/CMakeLists.txt index 4f811e2cf..0cd99c8e1 100644 --- a/src/MedCorba_Swig/CMakeLists.txt +++ b/src/MedCorba_Swig/CMakeLists.txt @@ -21,13 +21,13 @@ FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) SET_SOURCE_FILES_PROPERTIES(libMedCorba_Swig.i PROPERTIES CPLUSPLUS ON) -SET_SOURCE_FILES_PROPERTIES(libMedCorba_Swig.i PROPERTIES SWIG_FLAGS "-shadow") +SET_SOURCE_FILES_PROPERTIES(libMedCorba_Swig.i PROPERTIES SWIG_DEFINITIONS "-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} @@ -41,8 +41,8 @@ INCLUDE_DIRECTORIES( ) SWIG_ADD_MODULE(libMedCorba_Swig python libMedCorba_Swig.i) -SWIG_LINK_LIBRARIES(libMedCorba_Swig ${PYTHON_LIBRARIES} MEDMEMImpl MEDEngine) -SET_TARGET_PROPERTIES(_libMedCorba_Swig PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS} ${HDF5_FLAGS} ${MED3_FLAGS} ${XDR_FLAGS}") +SWIG_LINK_LIBRARIES(libMedCorba_Swig ${PYTHON_LIBS} MEDMEMImpl MEDEngine) +SET_TARGET_PROPERTIES(_libMedCorba_Swig PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${XDR_DEFINITIONS}") SET(MED_MedCorba_Swig_salomescript_DATA medcorba_test.py batchmode_medcorba_test.py batchmode_medcorba_test1.py diff --git a/src/ParaMEDCouplingCorba/CMakeLists.txt b/src/ParaMEDCouplingCorba/CMakeLists.txt index aa9ce8488..e8a73ad62 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 @@ -34,7 +34,7 @@ SET(paramedcouplingcorba_SOURCES ) ADD_LIBRARY(paramedcouplingcorba SHARED ${paramedcouplingcorba_SOURCES}) -SET_TARGET_PROPERTIES(paramedcouplingcorba PROPERTIES COMPILE_FLAGS "${MPI_FLAGS} ${OMNIORB_FLAGS}") +SET_TARGET_PROPERTIES(paramedcouplingcorba PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS}") TARGET_LINK_LIBRARIES(paramedcouplingcorba medcouplingcorba ${MPI_LIBS}) INSTALL(TARGETS paramedcouplingcorba DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/ParaMEDLoader/CMakeLists.txt b/src/ParaMEDLoader/CMakeLists.txt index 423592313..f30cd292f 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 @@ -34,8 +34,8 @@ SET(paramedloader_SOURCES ) ADD_LIBRARY(paramedloader SHARED ${paramedloader_SOURCES}) -SET_TARGET_PROPERTIES(paramedloader PROPERTIES COMPILE_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS}") -TARGET_LINK_LIBRARIES(paramedloader paramedmem medloader) +SET_TARGET_PROPERTIES(paramedloader PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS}") +TARGET_LINK_LIBRARIES(paramedloader paramedmem medloader ${PLATFORM_LIBS}) INSTALL(TARGETS paramedloader DESTINATION ${MED_salomelib_LIBS}) FILE(GLOB paramedloader_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") diff --git a/src/ParaMEDMEM/CMakeLists.txt b/src/ParaMEDMEM/CMakeLists.txt index 874cb1511..4ede58f2f 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 @@ -59,7 +59,7 @@ SET(paramedmem_SOURCES ) ADD_LIBRARY(paramedmem SHARED ${paramedmem_SOURCES}) -SET_TARGET_PROPERTIES(paramedmem PROPERTIES COMPILE_FLAGS "${MPI_FLAGS}") +SET_TARGET_PROPERTIES(paramedmem PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS}") TARGET_LINK_LIBRARIES(paramedmem medcoupling ${MPI_LIBS}) INSTALL(TARGETS paramedmem DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/ParaMEDMEMComponent/CMakeLists.txt b/src/ParaMEDMEMComponent/CMakeLists.txt index ec9e621f1..defab4c4d 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 @@ -36,7 +36,7 @@ SET(paramedmemcompo_SOURCES ) ADD_LIBRARY(paramedmemcompo SHARED ${paramedmemcompo_SOURCES}) -SET_TARGET_PROPERTIES(paramedmemcompo PROPERTIES COMPILE_FLAGS "${MPI_FLAGS} ${OMNIORB_FLAGS}") +SET_TARGET_PROPERTIES(paramedmemcompo PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS} ${OMNIORB_DEFINITIONS}") TARGET_LINK_LIBRARIES(paramedmemcompo medcouplingcorba paramedmem) INSTALL(TARGETS paramedmemcompo DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/ParaMEDMEMTest/CMakeLists.txt b/src/ParaMEDMEMTest/CMakeLists.txt index 3c0767f22..2f26862c7 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 @@ -65,7 +65,7 @@ SET(ParaMEDMEMTest_SOURCES ) ADD_LIBRARY(ParaMEDMEMTest SHARED ${ParaMEDMEMTest_SOURCES}) -SET_TARGET_PROPERTIES(ParaMEDMEMTest PROPERTIES COMPILE_FLAGS "${MPI_FLAGS} ${CPPUNIT_FLAGS}") +SET_TARGET_PROPERTIES(ParaMEDMEMTest PROPERTIES COMPILE_FLAGS "${MPI_DEFINITIONS} ${CPPUNIT_DEFINITIONS}") TARGET_LINK_LIBRARIES(ParaMEDMEMTest paramedmem paramedloader ${CPPUNIT_LIBS}) INSTALL(TARGETS ParaMEDMEMTest DESTINATION ${MED_salomelib_LIBS}) @@ -106,8 +106,18 @@ ENDIF(MPI2_IS_OK) FOREACH(bintestparamem ${TESTSParaMEDMEM}) ADD_EXECUTABLE(${bintestparamem} ${${bintestparamem}_SOURCES}) - SET_TARGET_PROPERTIES(${bintestparamem} PROPERTIES COMPILE_FLAGS "${MPI_FLGAS} ${CPPUNIT_FLAGS}") + SET_TARGET_PROPERTIES(${bintestparamem} PROPERTIES COMPILE_FLAGS "${MPI_FLGAS} ${CPPUNIT_DEFINITIONS}") TARGET_LINK_LIBRARIES(${bintestparamem} ParaMEDMEMTest) ENDFOREACH(bintestparamem ${TESTSParaMEDMEM}) INSTALL(TARGETS ${TESTSParaMEDMEM} DESTINATION ${MED_salomebin_BINS}) +SET(COMMON_HEADERS_HXX + MPIMainTest.hxx + MPIAccessDECTest.hxx + MPIAccessTest.hxx + ParaMEDMEMTest.hxx + MPI2Connector.hxx +) +INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${MED_salomeinclude_HEADERS}) + + \ No newline at end of file diff --git a/src/ParaMEDMEM_Swig/CMakeLists.txt b/src/ParaMEDMEM_Swig/CMakeLists.txt index d4de72f06..ca4b343b7 100644 --- a/src/ParaMEDMEM_Swig/CMakeLists.txt +++ b/src/ParaMEDMEM_Swig/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/InstallAndCompilePythonFile.cmake) +INCLUDE(${SALOME_MACROS_DIR}/InstallAndCompilePythonFile.cmake) FIND_PACKAGE(SWIG REQUIRED) INCLUDE(${SWIG_USE_FILE}) @@ -40,11 +40,12 @@ INCLUDE_DIRECTORIES( ) SWIG_ADD_MODULE(ParaMEDMEM python ParaMEDMEM.i) -SWIG_LINK_LIBRARIES(ParaMEDMEM ${PYTHON_LIBRARIES} paramedmem medloader) +SWIG_LINK_LIBRARIES(ParaMEDMEM ${PYTHON_LIBS} paramedmem medloader) SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(ParaMEDMEM.i PROPERTIES SWIG_FLAGS "-shadow") INSTALL(TARGETS _ParaMEDMEM DESTINATION ${MED_salomepythondir}) INSTALL(FILES ParaMEDMEM.i DESTINATION ${MED_salomeinclude_HEADERS}) -INSTALL_AND_COMPILE_PYTHON_FILE(${CMAKE_CURRENT_BINARY_DIR}/ParaMEDMEM.py ${MED_salomescript_PYTHON}) +INSTALL_AND_COMPILE_PYTHON_FILE(${CMAKE_CURRENT_BINARY_DIR}/ParaMEDMEM.py ${MED_salomepythondir}) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/ParaMEDMEM.py test_InterpKernelDEC.py test_NonCoincidentDEC.py test_StructuredCoincidentDEC.py DESTINATION ${MED_salomescript_PYTHON}) \ No newline at end of file diff --git a/src/RENUMBER/CMakeLists.txt b/src/RENUMBER/CMakeLists.txt index 62db78727..ebbc033e2 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 @@ -46,29 +46,29 @@ SET(renumber_SOURCES ) SET(renumbercpp_LDFLAGS medmem) -SET(renumber_FLAGS "${HDF5_FLAGS} ${MED3_FLAGS} ${BOOST_FLAGS}") +SET(renumber_DEFINITIONS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS}") IF(MED_ENABLE_METIS) SET(renumbercpp_SOURCES ${renumbercpp_SOURCES} RENUMBER_METISRenumbering.cxx) SET(renumbercpp_HEADERS_HXX ${renumbercpp_HEADERS_HXX} RENUMBER_METISRenumbering.hxx) SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${METIS_LIBS}) - SET(renumber_FLAGS "${renumber_FLAGS} ${METIS_FLAGS}") + SET(renumber_DEFINITIONS "${renumber_DEFINITIONS} ${METIS_DEFINITIONS}") ENDIF(MED_ENABLE_METIS) IF(BOOST_STATUS) SET(renumbercpp_SOURCES ${renumbercpp_SOURCES} RENUMBER_BOOSTRenumbering.cxx) SET(renumbercpp_HEADERS_HXX ${renumbercpp_HEADERS_HXX} RENUMBER_BOOSTRenumbering.hxx) SET(renumbercpp_LDFLAGS ${renumbercpp_LDFLAGS} ${BOOST_LIBS}) - SET(renumber_FLAGS "${renumber_FLAGS} ${BOOST_FLAGS} -DENABLE_BOOST") + SET(renumber_DEFINITIONS "${renumber_DEFINITIONS} ${BOOST_DEFINITIONS} -DENABLE_BOOST") ENDIF(BOOST_STATUS) ADD_EXECUTABLE(renumber ${renumber_SOURCES}) -SET_TARGET_PROPERTIES(renumber PROPERTIES COMPILE_FLAGS "${renumber_FLAGS}") +SET_TARGET_PROPERTIES(renumber PROPERTIES COMPILE_FLAGS "${renumber_DEFINITIONS}") TARGET_LINK_LIBRARIES(renumber renumbercpp) INSTALL(TARGETS renumber DESTINATION ${MED_salomebin_BINS}) ADD_LIBRARY(renumbercpp SHARED ${renumbercpp_SOURCES}) -SET_TARGET_PROPERTIES(renumbercpp PROPERTIES COMPILE_FLAGS "${renumber_FLAGS}") +SET_TARGET_PROPERTIES(renumbercpp PROPERTIES COMPILE_FLAGS "${renumber_DEFINITIONS}") TARGET_LINK_LIBRARIES(renumbercpp ${renumbercpp_LDFLAGS}) INSTALL(TARGETS renumbercpp DESTINATION ${MED_salomelib_LIBS}) diff --git a/src/RENUMBER/RENUMBERDefines.hxx b/src/RENUMBER/RENUMBERDefines.hxx index e3c74701c..3aae37029 100755 --- a/src/RENUMBER/RENUMBERDefines.hxx +++ b/src/RENUMBER/RENUMBERDefines.hxx @@ -22,13 +22,13 @@ //export symbols #ifdef WIN32 -# if defined RENUMBER_EXPORTS || defined renumber_EXPORTS -# define RENUMBER_EXPORT __declspec(dllexport) +# if defined RENUMBERCPP_EXPORTS || defined renumbercpp_EXPORTS +# define RENUMBERCPP_EXPORT __declspec(dllexport) # else -# define RENUMBER_EXPORT __declspec(dllimport) +# define RENUMBERCPP_EXPORT __declspec(dllimport) # endif #else -# define RENUMBER_EXPORT +# define RENUMBERCPP_EXPORT #endif #endif // __RENUMBERDEFINES_HXX__ diff --git a/src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx b/src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx index 070723b78..e98bf5351 100644 --- a/src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx +++ b/src/RENUMBER/RENUMBER_BOOSTRenumbering.hxx @@ -23,7 +23,7 @@ #include "RENUMBERDefines.hxx" #include "RENUMBER_Renumbering.hxx" -class RENUMBER_EXPORT BOOSTRenumbering:public Renumbering +class RENUMBERCPP_EXPORT BOOSTRenumbering:public Renumbering { public: virtual void renumber(const int* graph,const int* index_graph,int nb_cell,std::vector& iperm,std::vector& perm); diff --git a/src/RENUMBER/RENUMBER_METISRenumbering.hxx b/src/RENUMBER/RENUMBER_METISRenumbering.hxx index 8a2d05bd1..b3efabaea 100644 --- a/src/RENUMBER/RENUMBER_METISRenumbering.hxx +++ b/src/RENUMBER/RENUMBER_METISRenumbering.hxx @@ -23,7 +23,7 @@ #include "RENUMBERDefines.hxx" #include "RENUMBER_Renumbering.hxx" -class RENUMBER_EXPORT METISRenumbering:public Renumbering +class RENUMBERCPP_EXPORT METISRenumbering:public Renumbering { public: virtual void renumber(const int* graph,const int* index_graph,int nb_cell,std::vector& iperm,std::vector& perm); diff --git a/src/RENUMBER/RENUMBER_Renumbering.hxx b/src/RENUMBER/RENUMBER_Renumbering.hxx index 22496a770..2b3b8752f 100644 --- a/src/RENUMBER/RENUMBER_Renumbering.hxx +++ b/src/RENUMBER/RENUMBER_Renumbering.hxx @@ -22,7 +22,7 @@ #include "RENUMBERDefines.hxx" #include -class RENUMBER_EXPORT Renumbering +class RENUMBERCPP_EXPORT Renumbering { public: virtual void renumber(const int* graphe,const int* index_graphe,int nb_cell,std::vector& iperm,std::vector& perm)=0; diff --git a/src/RENUMBER/RenumberingFactory.hxx b/src/RENUMBER/RenumberingFactory.hxx index a7bab20d2..2c68f78bf 100644 --- a/src/RENUMBER/RenumberingFactory.hxx +++ b/src/RENUMBER/RenumberingFactory.hxx @@ -26,7 +26,7 @@ namespace MED_RENUMBER { - RENUMBER_EXPORT Renumbering* RenumberingFactory(const std::string& s); + RENUMBERCPP_EXPORT Renumbering* RenumberingFactory(const std::string& s); } #endif /*RENUMBERINGFACTORY_HXX_*/ -- 2.39.2