From: Gérald NICOLAS Date: Tue, 26 May 2020 07:48:59 +0000 (+0200) Subject: Pilotage des bibliothèques X-Git-Tag: V9_7_0a1~18^2~96 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1e51d8ea8931447dfd75e631b0f20908c2353df1;p=modules%2Fsmesh.git Pilotage des bibliothèques --- diff --git a/CMakeLists.txt b/CMakeLists.txt index cf1162252..ad268dcd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -334,6 +334,7 @@ SET(_${PROJECT_NAME}_exposed_targets SMDS SMESHimpl SMESHEngine SMESHClient SMESHDS SMESHUtils StdMeshers StdMeshersEngine MeshJobManagerEngine SPADDERPluginTesterEngine SalomeIDLSMESH SalomeIDLSPADDER + ADAPTEngine ADAPTFrontTrack ADAPTImpl ) IF(SALOME_SMESH_ENABLE_MEFISTO) @@ -343,7 +344,7 @@ ENDIF(SALOME_SMESH_ENABLE_MEFISTO) IF(SALOME_BUILD_GUI) LIST(APPEND _${PROJECT_NAME}_exposed_targets - SMESHObject SMESHFiltersSelection SMESH PluginUtils StdMeshersGUI + SMESHObject SMESHFiltersSelection SMESH PluginUtils StdMeshersGUI ADAPTGUI ) ENDIF(SALOME_BUILD_GUI) diff --git a/src/ADAPTGUI/CMakeLists.txt b/src/ADAPTGUI/CMakeLists.txt index d71b88b22..ee193c6af 100644 --- a/src/ADAPTGUI/CMakeLists.txt +++ b/src/ADAPTGUI/CMakeLists.txt @@ -169,9 +169,9 @@ SET(ADAPT_SOURCES ${_other_SOURCES} ${_moc_SOURCES} ${_uic_HEADERS}) # --- rules --- -ADD_LIBRARY(ADAPT ${ADAPT_SOURCES}) -TARGET_LINK_LIBRARIES(ADAPT ${_link_LIBRARIES} ) -INSTALL(TARGETS ADAPT EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) +ADD_LIBRARY(ADAPTGUI ${ADAPT_SOURCES}) +TARGET_LINK_LIBRARIES(ADAPTGUI ${_link_LIBRARIES} ) +INSTALL(TARGETS ADAPTGUI EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_INSTALL_LIBS}) INSTALL(FILES ${ADAPT_HEADERS} DESTINATION ${SALOME_INSTALL_HEADERS}) QT_INSTALL_TS_RESOURCES("${_ts_RESOURCES}" "${SALOME_ADAPT_INSTALL_RES_DATA}") diff --git a/src/SMESHGUI/CMakeLists.txt b/src/SMESHGUI/CMakeLists.txt index 9797f9199..53f99bf29 100644 --- a/src/SMESHGUI/CMakeLists.txt +++ b/src/SMESHGUI/CMakeLists.txt @@ -74,6 +74,7 @@ SET(_link_LIBRARIES SMDS SMESHControls SMESHObject + ADAPTGUI ) # --- headers ---