From 0e6cc98781b16994083cd7c76a522b716d2672e7 Mon Sep 17 00:00:00 2001 From: bruneton Date: Wed, 3 Jul 2013 12:37:49 +0000 Subject: [PATCH] CMake: minimal set of changes so that MED compiles with: - either the old or the new medfile prerequisite - with the CMake built KERNEL and GUI. --- CMakeLists.txt | 113 ++++++++++++------ idl/CMakeLists.txt | 6 +- src/MEDCalculator/CMakeLists.txt | 6 +- src/MEDCouplingCorba/CMakeLists.txt | 2 +- src/MEDCouplingCorba/Client/CMakeLists.txt | 2 +- src/MEDCouplingCorba/Test/CMakeLists.txt | 2 +- src/MEDCouplingCorba_Swig/CMakeLists.txt | 2 +- .../Client/CMakeLists.txt | 2 +- src/MEDGUI/CMakeLists.txt | 5 +- src/MEDOP/cmp/CMakeLists.txt | 2 +- src/MEDOP/gui/CMakeLists.txt | 9 +- src/MEDOP/gui/dialogs/CMakeLists.txt | 9 +- src/ParaMEDCouplingCorba/CMakeLists.txt | 2 +- src/ParaMEDMEMComponent/CMakeLists.txt | 2 +- 14 files changed, 106 insertions(+), 58 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79e8c109e..68caca481 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR) IF(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) @@ -31,6 +31,7 @@ SET(WITH_MEDMEMGUI "0") #Defining all options first option(SALOME_USE_MPI "Use MPI containers" OFF) + SET(KERNEL_ROOT_DIR $ENV{KERNEL_ROOT_DIR}) IF(KERNEL_ROOT_DIR) FILE(TO_CMAKE_PATH $ENV{KERNEL_ROOT_DIR} KERNEL_ROOT_DIR) @@ -38,60 +39,97 @@ IF(KERNEL_ROOT_DIR) # directories for packages detection SET(SALOME_MACROS_DIR ${KERNEL_ROOT_DIR}/salome_adm/cmake_files) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${SALOME_MACROS_DIR}) + LIST(APPEND CMAKE_MODULE_PATH "${SALOME_MACROS_DIR}") - INCLUDE(SalomeSetupPlatform) INCLUDE(SalomeMacros) + INCLUDE(SalomeSetupPlatform) + + FIND_PACKAGE(SalomeKERNEL) + + # Try first to find medfile version using the new CMake first + FIND_PACKAGE(SalomeMedfile QUIET) + IF(medfile_FOUND) + MESSAGE(STATUS "Found Medfile in config mode (new CMake version of medfile)") + # Backward compat: + SET(MED_ENABLE_MED3 ON) + SET(MED3_INCLUDE_DIRS "${MEDFILE_INCLUDE_DIRS}") + SET(MED3_LIBS_C_ONLY "${MEDFILE_C_LIBRARIES}") + ELSE() + # if not found, revert to the old logic: + FIND_PACKAGE(MEDFILE REQUIRED) + SET(MED_ENABLE_MED3 ON) + ENDIF() + + FIND_PACKAGE(SalomePThread) + FIND_PACKAGE(SalomePython) + SET(PYTHON_LIBS ${PYTHON_LIBRARIES}) + + FIND_PACKAGE(SalomeOmniORB) + SET(OMNIORB_LIBS ${OMNIORB_LIBRARIES}) + + IF(SALOME_USE_MPI) + FIND_PACKAGE(SalomeMPI) + SET(MPI_IS_OK 1) + ENDIF() + + FIND_PACKAGE(SalomeHDF5) + FIND_PACKAGE(SalomeBoost) + + FIND_PACKAGE(SalomeLibXml2) + # Backward compat: + SET(LIBXML_INCLUDE_DIRS "${LIBXML2_INCLUDE_DIR}") + SET(LIBXML_LIBS "${LIBXML2_LIBRARIES}") + + FIND_PACKAGE(SalomeSWIG) + SET(SWIG_STATUS TRUE) + + FIND_PACKAGE(SalomeCppUnit) + SET(CPPUNIT_IS_OK ON) + SET(CPPUNIT_LIBS "${CPPUNIT_LIBRARIES}") + + FIND_PACKAGE(SalomeDoxygen) + FIND_PACKAGE(SalomeSphinx) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindPYTHON.cmake) - if(SALOME_USE_MPI) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindMPI.cmake) - endif(SALOME_USE_MPI) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindOMNIORB.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindPTHREADS.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindHDF5.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindBOOST.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindLIBXML2.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindSWIG.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindCppUnit.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindDOXYGEN.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSphinx.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSalomeLibBatch.cmake) - INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/FindKERNEL.cmake) - #INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindMEDFILE.cmake) + SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR}) FILE(TO_CMAKE_PATH "$ENV{GUI_ROOT_DIR}" GUI_ROOT_DIR) IF(GUI_ROOT_DIR) LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files") SET(MED_ENABLE_GUI ON) - #INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindCAS.cmake) + + FIND_PACKAGE(SalomeGUI) + FIND_PACKAGE(SalomeCAS) - INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindQT4.cmake) - INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindOPENGL.cmake) - #INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/FindSalomeVTK.cmake) - INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindQWT.cmake) - INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindSIPPYQT.cmake) - INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/deprecated/FindGUI.cmake) + FIND_PACKAGE(SalomeOpenGL) + FIND_PACKAGE(SalomeQt4) + + FIND_PACKAGE(SalomeQwt) + FIND_PACKAGE(SalomePyQt4) ENDIF(GUI_ROOT_DIR) ELSE(KERNEL_ROOT_DIR) SET(SALOME_MACROS_DIR ${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files) + LIST(APPEND CMAKE_MODULE_PATH "${SALOME_MACROS_DIR}") + + # TODO: the macros below should be loaded with a FIND_PACKAGE(), and should be sync'd with + # what has been done in KERNEL + GUI: - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindPLATFORM.cmake) + INCLUDE(FindPLATFORM) if(SALOME_USE_MPI) - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindMPI.cmake) + INCLUDE(FindMPI) endif(SALOME_USE_MPI) - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindBOOST.cmake) - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindCPPUNIT.cmake) - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindHDF5.cmake) - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindPYTHON.cmake) - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindLIBXML2.cmake) - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindPTHREADS.cmake) - INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindSWIG.cmake) + INCLUDE(FindMEDFILE) + INCLUDE(FindBOOST) + INCLUDE(FindCPPUNIT) + INCLUDE(FindHDF5) + INCLUDE(FindPYTHON) + INCLUDE(FindLIBXML2) + INCLUDE(FindPTHREADS) + INCLUDE(FindSWIG) #INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindMEDFILE.cmake) - ENDIF(KERNEL_ROOT_DIR) -INCLUDE(${CMAKE_SOURCE_DIR}/adm_local_without_kernel/cmake_files/FindMEDFILE.cmake) + +# TODO: write those in the new format, and load them via FIND_PACKAGE(): INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindPARMETIS.cmake) INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindMETIS.cmake) INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/FindSCOTCH.cmake) @@ -104,6 +142,7 @@ ENDIF(WIN32) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; t=sys.argv[-1].split(\".\") ; t[:]=(int(elt) for elt in t) ; sys.stdout.write(\"0x%02x%02x%02x\"%tuple(t))" ${VERSION} OUTPUT_VARIABLE XVERSION) +# TODO: adjust to the global SALOME install dirs exposed from KERNEL: SET(MED_salomebin_BINS bin/salome) SET(MED_salomelib_LIBS lib/salome) SET(MED_salomeidl_IDLS idl/salome) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index d5a94a34d..3e328f4f1 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -18,10 +18,10 @@ # # Author : Anthony Geay (CEA/DEN) -INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/deprecated/UseOMNIORB.cmake) +INCLUDE(UseOmniORB) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR} ) @@ -57,7 +57,7 @@ ELSE(WINDOWS) ENDIF(WINDOWS ) OMNIORB_ADD_MODULE(SalomeIDLMED "${SalomeIDLMED_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" ${TYPE}) -TARGET_LINK_LIBRARIES(SalomeIDLMED ${CORBA_LIBS} ${KERNEL_LDFLAGS} ${SalomeIDLKernel}) +TARGET_LINK_LIBRARIES(SalomeIDLMED ${CORBA_LIBS} ${KERNEL_LDFLAGS} ${KERNEL_SalomeIDLKernel}) SET_TARGET_PROPERTIES(SalomeIDLMED PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}") OMNIORB_ADD_MODULE(SalomeIDLMEDTests "${SalomeIDLMEDTests_IDLSOURCES}" "${IDL_INCLUDE_DIRS}" ${TYPE}) diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt index 0cb6372d1..684004237 100644 --- a/src/MEDCalculator/CMakeLists.txt +++ b/src/MEDCalculator/CMakeLists.txt @@ -27,7 +27,7 @@ ENDIF(CPPUNIT_IS_OK) INCLUDE_DIRECTORIES( ${MED3_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR}/../../idl @@ -53,7 +53,9 @@ SET(medcalculator_SOURCES ADD_LIBRARY(medcalculator SHARED ${medcalculator_SOURCES}) SET_TARGET_PROPERTIES(medcalculator PROPERTIES COMPILE_FLAGS "${HDF5_DEFINITIONS} ${MED3_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -TARGET_LINK_LIBRARIES(medcalculator medloader medcouplingcorba ${KERNEL_LDFLAGS} ${SALOMELocalTrace} ${SalomeNS} ${OpUtil} ${OMNIORB_LIBS} ${PLATFORM_LIBS}) +TARGET_LINK_LIBRARIES(medcalculator medloader medcouplingcorba ${KERNEL_LDFLAGS} + ${KERNEL_SALOMELocalTrace} ${KERNEL_SalomeNS} ${KERNEL_OpUtil} + ${OMNIORB_LIBS} ${PLATFORM_LIBS}) INSTALL(TARGETS medcalculator DESTINATION ${MED_salomelib_LIBS}) FILE(GLOB medcalculator_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt index dbaa5f700..bbe017c60 100644 --- a/src/MEDCouplingCorba/CMakeLists.txt +++ b/src/MEDCouplingCorba/CMakeLists.txt @@ -25,7 +25,7 @@ IF (CPPUNIT_IS_OK) ENDIF (CPPUNIT_IS_OK) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt index 38b4590a1..a7aaef2bf 100644 --- a/src/MEDCouplingCorba/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba/Client/CMakeLists.txt @@ -19,7 +19,7 @@ # Author : Anthony Geay (CEA/DEN) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR}/../../../idl ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCoupling diff --git a/src/MEDCouplingCorba/Test/CMakeLists.txt b/src/MEDCouplingCorba/Test/CMakeLists.txt index 7c2e0b91b..14daa962e 100644 --- a/src/MEDCouplingCorba/Test/CMakeLists.txt +++ b/src/MEDCouplingCorba/Test/CMakeLists.txt @@ -19,7 +19,7 @@ # Author : Anthony Geay (CEA/DEN) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt index 2aa8561b8..7ced5f976 100644 --- a/src/MEDCouplingCorba_Swig/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt @@ -35,7 +35,7 @@ SET(MEDCouplingCorba_SWIG_DPYS_FILES INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR}/../../idl ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt index d6634d008..a8e8fde57 100644 --- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt @@ -30,7 +30,7 @@ ENDIF(NUMPY_STATUS) INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR}/../../../idl ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/MEDGUI/CMakeLists.txt b/src/MEDGUI/CMakeLists.txt index b3d51fa6d..6910694f5 100644 --- a/src/MEDGUI/CMakeLists.txt +++ b/src/MEDGUI/CMakeLists.txt @@ -17,7 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/UseQt4Ext.cmake) +INCLUDE(${QT_USE_FILE}) +INCLUDE(UseQt4Ext) SET(MEDGUI_SOURCES MEDGUIFileContentDial.cxx @@ -35,7 +36,7 @@ QT4_WRAP_UI(MEDGUI_FORMS_HEADERS ${MEDGUI_FORMS}) #QT4_ADD_RESOURCES(MEDGUI_RESOURCES_RCC ${MEDGUI_RESOURCES}) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${CAS_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDOP/cmp/CMakeLists.txt index e4582f2e2..d7348b0a5 100644 --- a/src/MEDOP/cmp/CMakeLists.txt +++ b/src/MEDOP/cmp/CMakeLists.txt @@ -18,7 +18,7 @@ # INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${MED3_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt index 71fe05104..7ad04d92b 100644 --- a/src/MEDOP/gui/CMakeLists.txt +++ b/src/MEDOP/gui/CMakeLists.txt @@ -17,9 +17,12 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # +INCLUDE(${QT_USE_FILE}) +SET(QT_LIBS "${QT_LIBRARIES}") +INCLUDE(UseQt4Ext) + ADD_SUBDIRECTORY(dialogs) -INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/UseQt4Ext.cmake) SET(MEDOPGUI_SOURCES MEDOPFactoryClient.cxx @@ -37,7 +40,7 @@ SET(MEDOPGUI_HEADERS MEDOPModule.hxx MEDEventListener_i.hxx WorkspaceController. QT4_WRAP_CPP(MEDOPGUI_HEADERS_MOC ${MEDOPGUI_HEADERS}) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${CAS_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} @@ -61,7 +64,7 @@ SET(COMMON_DEFINITIONS "${MED3_DEFINITIONS} ${XDR_DEFINITIONS} ${CAS_DEFINITIONS SET(COMMON_FLAGS ${CAS_KERNEL} ${QT_MT_LIBS} - ${OMNIORB_LIBS} + ${OMNIORB_LIBRARIES} ${PLATFORM_LIBS} ${BOOST_LIBS} SalomeIDLMED diff --git a/src/MEDOP/gui/dialogs/CMakeLists.txt b/src/MEDOP/gui/dialogs/CMakeLists.txt index 8d0a38c01..2dda0a4e5 100644 --- a/src/MEDOP/gui/dialogs/CMakeLists.txt +++ b/src/MEDOP/gui/dialogs/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${GUI_ROOT_DIR}/adm_local/cmake_files/UseQt4Ext.cmake) +INCLUDE(UseQt4Ext) MACRO (QT4_WRAP_UI_XX outfiles ) QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN}) @@ -52,7 +52,7 @@ SET(MEDOPGUI_dialogs_FILES QT4_WRAP_CPP(MEDOPGUI_dialogs_HEADERS_MOC ${MEDOPGUI_dialogs_FILES}) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${CAS_INCLUDE_DIRS} ${BOOST_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} @@ -60,6 +60,7 @@ INCLUDE_DIRECTORIES( ${KERNEL_ROOT_DIR}/include/salome ${GUI_ROOT_DIR}/include/salome ${CMAKE_CURRENT_SOURCE_DIR}/.. + ${QT4_INCLUDE_DIRECTORY} ) SET(MEDOPGUI_dialogs_SOURCES @@ -72,7 +73,9 @@ SET(MEDOPGUI_dialogs_SOURCES ADD_LIBRARY(MEDOPGUI_dialogs SHARED ${MEDOPGUI_dialogs_SOURCES} ${MEDOPGUI_dialogs_HEADERS_MOC} ${MEDOPGUI_dialogs_FORMS_HEADERS}) SET_TARGET_PROPERTIES(MEDOPGUI_dialogs PROPERTIES COMPILE_FLAGS "${CAS_DEFINITIONS} ${BOOST_DEFINITIONS} ${PLATFORM_DEFINITIONS} ${OMNIORB_DEFINITIONS}") -TARGET_LINK_LIBRARIES(MEDOPGUI_dialogs ${CAS_KERNEL} ${QT_LIBS} ${SalomeIDLKernel} ${SalomeGuiHelpers} ${OMNIORB_LIBS} ${qtx} ${suit} ${PLATFORM_LIBS} ${SalomeLifeCycleCORBA} ${SalomeKernelHelpers} ${SalomeGuiHelpers}) +TARGET_LINK_LIBRARIES(MEDOPGUI_dialogs ${CAS_KERNEL} ${QT_LIBS} ${KERNEL_SalomeIDLKernel} + ${GUI_SalomeGuiHelpers} ${OMNIORB_LIBS} ${GUI_qtx} ${GUI_suit} ${PLATFORM_LIBS} + ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SalomeKernelHelpers} ${GUI_SalomeGuiHelpers}) INSTALL(TARGETS MEDOPGUI_dialogs DESTINATION ${MED_salomelib_LIBS}) # diff --git a/src/ParaMEDCouplingCorba/CMakeLists.txt b/src/ParaMEDCouplingCorba/CMakeLists.txt index 9023ea68a..3e689d061 100644 --- a/src/ParaMEDCouplingCorba/CMakeLists.txt +++ b/src/ParaMEDCouplingCorba/CMakeLists.txt @@ -18,7 +18,7 @@ # INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${MPI_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR}/../../idl diff --git a/src/ParaMEDMEMComponent/CMakeLists.txt b/src/ParaMEDMEMComponent/CMakeLists.txt index 5031f436a..ce7f5f1de 100644 --- a/src/ParaMEDMEMComponent/CMakeLists.txt +++ b/src/ParaMEDMEMComponent/CMakeLists.txt @@ -18,7 +18,7 @@ # INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS} ${MPI_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR}/../../idl -- 2.39.2