From 01f709d93946583c014711bc0c87b7e562e809e9 Mon Sep 17 00:00:00 2001 From: ageay Date: Mon, 8 Jul 2013 05:41:59 +0000 Subject: [PATCH] Some additional exports. --- CMakeLists.txt | 2 +- adm_local/cmake_files/SalomeMEDConfig.cmake.in | 1 + idl/CMakeLists.txt | 3 ++- src/MEDCoupling/CMakeLists.txt | 2 +- src/MEDCouplingCorba/CMakeLists.txt | 2 +- src/MEDCouplingCorba/Client/CMakeLists.txt | 2 +- src/MEDLoader/CMakeLists.txt | 2 +- src/ParaMEDLoader/CMakeLists.txt | 2 +- src/ParaMEDMEM/CMakeLists.txt | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 25fad4e81..a4b0f7442 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,7 +206,7 @@ INCLUDE(CMakePackageConfigHelpers) # List of targets in this project we want to make visible to the rest of the world. # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup" SET(_${PROJECT_NAME}_exposed_targets - interpkernel medcoupling) + interpkernel medcoupling medcouplingremapper) IF(NOT SALOME_MED_MICROMED) LIST(APPEND _${PROJECT_NAME}_exposed_targets diff --git a/adm_local/cmake_files/SalomeMEDConfig.cmake.in b/adm_local/cmake_files/SalomeMEDConfig.cmake.in index 22fa7b8d7..191c34e0a 100644 --- a/adm_local/cmake_files/SalomeMEDConfig.cmake.in +++ b/adm_local/cmake_files/SalomeMEDConfig.cmake.in @@ -112,6 +112,7 @@ ENDIF() # Exposed GUI targets: SET(MED_interpkernel interpkernel) SET(MED_medcoupling medcoupling) +SET(MED_medcouplingremapper medcouplingremapper) SET(MED_medloader medloader) SET(MED_paramedmem paramedmem) SET(MED_paramedloader paramedloader) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 37ee6a2f1..b67ebe47b 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -64,4 +64,5 @@ OMNIORB_ADD_MODULE(SalomeIDLMEDTests "${SalomeIDLMEDTests_IDLSOURCES}" "${IDL_IN TARGET_LINK_LIBRARIES(SalomeIDLMEDTests SalomeIDLMED) SET_TARGET_PROPERTIES(SalomeIDLMEDTests PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS} ${PLATFORM_DEFINITIONS}") -INSTALL(TARGETS SalomeIDLMED SalomeIDLMEDTests DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS SalomeIDLMED EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS SalomeIDLMEDTests DESTINATION ${SALOME_INSTALL_LIBS}) diff --git a/src/MEDCoupling/CMakeLists.txt b/src/MEDCoupling/CMakeLists.txt index 0e99eb836..520777b52 100644 --- a/src/MEDCoupling/CMakeLists.txt +++ b/src/MEDCoupling/CMakeLists.txt @@ -69,7 +69,7 @@ INSTALL(TARGETS medcoupling EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALO ADD_LIBRARY(medcouplingremapper SHARED ${medcouplingremapper_SOURCES}) TARGET_LINK_LIBRARIES(medcouplingremapper medcoupling) SET_TARGET_PROPERTIES(medcouplingremapper PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS}") -INSTALL(TARGETS medcouplingremapper DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS medcouplingremapper EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB medcoupling_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") FILE(GLOB medcoupling_HEADERS_TXX "${CMAKE_CURRENT_SOURCE_DIR}/*.txx") diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt index b62e5896a..25530c9c2 100644 --- a/src/MEDCouplingCorba/CMakeLists.txt +++ b/src/MEDCouplingCorba/CMakeLists.txt @@ -56,7 +56,7 @@ SET(medcouplingcorba_SOURCES ADD_LIBRARY(medcouplingcorba SHARED ${medcouplingcorba_SOURCES}) TARGET_LINK_LIBRARIES(medcouplingcorba medcoupling SalomeIDLMED ${PLATFORM_LIBS}) -INSTALL(TARGETS medcouplingcorba DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS medcouplingcorba EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB medcouplingcorba_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${medcouplingcorba_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt index 046ba8c51..c8cf5b133 100644 --- a/src/MEDCouplingCorba/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba/Client/CMakeLists.txt @@ -43,7 +43,7 @@ SET(medcouplingclient_SOURCES ADD_LIBRARY(medcouplingclient SHARED ${medcouplingclient_SOURCES}) TARGET_LINK_LIBRARIES(medcouplingclient medcoupling SalomeIDLMED ${OMNIORB_LIBRARIES} ${PLATFORM_LIBS}) -INSTALL(TARGETS medcouplingclient DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS medcouplingclient EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB medcouplingclient_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${medcouplingclient_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/MEDLoader/CMakeLists.txt b/src/MEDLoader/CMakeLists.txt index 261e5d01c..9584fcf16 100644 --- a/src/MEDLoader/CMakeLists.txt +++ b/src/MEDLoader/CMakeLists.txt @@ -59,7 +59,7 @@ SET(medloader_SOURCES ADD_LIBRARY(medloader SHARED ${medloader_SOURCES}) SET_TARGET_PROPERTIES(medloader PROPERTIES COMPILE_FLAGS "") TARGET_LINK_LIBRARIES(medloader medcoupling ${MEDFILE_C_LIBRARIES} ${HDF5_LIBRARIES}) -INSTALL(TARGETS medloader DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS medloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB medloader_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${medloader_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/ParaMEDLoader/CMakeLists.txt b/src/ParaMEDLoader/CMakeLists.txt index 11f659034..708d900d3 100644 --- a/src/ParaMEDLoader/CMakeLists.txt +++ b/src/ParaMEDLoader/CMakeLists.txt @@ -38,7 +38,7 @@ SET(paramedloader_SOURCES ADD_LIBRARY(paramedloader SHARED ${paramedloader_SOURCES}) TARGET_LINK_LIBRARIES(paramedloader paramedmem medloader ${PLATFORM_LIBS}) -INSTALL(TARGETS paramedloader DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS paramedloader EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB paramedloader_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${paramedloader_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) diff --git a/src/ParaMEDMEM/CMakeLists.txt b/src/ParaMEDMEM/CMakeLists.txt index 6c573f798..390c6f984 100644 --- a/src/ParaMEDMEM/CMakeLists.txt +++ b/src/ParaMEDMEM/CMakeLists.txt @@ -63,7 +63,7 @@ SET(paramedmem_SOURCES ADD_LIBRARY(paramedmem SHARED ${paramedmem_SOURCES}) TARGET_LINK_LIBRARIES(paramedmem medcoupling ${MPI_LIBRARIES}) -INSTALL(TARGETS paramedmem DESTINATION ${SALOME_INSTALL_LIBS}) +INSTALL(TARGETS paramedmem EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) FILE(GLOB paramedmem_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${paramedmem_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) -- 2.39.2