From c36bdb4e34687492e2b95532eda7e9888ec41b2f Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 20 Aug 2018 20:40:08 +0200 Subject: [PATCH] CMP0050: make Start module aware of cmake policy --- src/Mod/Start/App/CMakeLists.txt | 5 ----- src/Mod/Start/CMakeLists.txt | 20 ++++++++++++++--- src/Mod/Start/Gui/CMakeLists.txt | 30 ++++++-------------------- src/Mod/Start/StartPage/CMakeLists.txt | 19 ++++++++++++++++ 4 files changed, 43 insertions(+), 31 deletions(-) diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt index a12d323b84..ef7d5d11e0 100644 --- a/src/Mod/Start/App/CMakeLists.txt +++ b/src/Mod/Start/App/CMakeLists.txt @@ -23,11 +23,6 @@ add_library(Start SHARED ${Start_SRCS}) target_link_libraries(Start ${Start_LIBS}) -fc_target_copy_resource(Start - ${CMAKE_SOURCE_DIR}/src/Mod/Start - ${CMAKE_BINARY_DIR}/Mod/Start - Init.py) - SET_BIN_DIR(Start Start /Mod/Start) SET_PYTHON_PREFIX_SUFFIX(Start) diff --git a/src/Mod/Start/CMakeLists.txt b/src/Mod/Start/CMakeLists.txt index 425e0d18e3..02359c330f 100644 --- a/src/Mod/Start/CMakeLists.txt +++ b/src/Mod/Start/CMakeLists.txt @@ -1,5 +1,9 @@ - add_subdirectory(App) + +set(Start_Scripts + Init.py +) + if(BUILD_GUI) SET(StartPage_Scripts StartPage.py @@ -24,14 +28,24 @@ if(BUILD_GUI) images/installed.png ) + list(APPEND Start_Scripts InitGui.py) + add_subdirectory(Gui) add_subdirectory(StartPage) endif(BUILD_GUI) +add_custom_target(StartScripts ALL + SOURCES ${Start_Scripts} +) + +fc_target_copy_resource(StartScripts + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/Mod/Start + ${Start_Scripts}) + INSTALL( FILES - Init.py - InitGui.py + ${Start_Scripts} DESTINATION Mod/Start ) diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index 5053a03e0c..79a8d34182 100644 --- a/src/Mod/Start/Gui/CMakeLists.txt +++ b/src/Mod/Start/Gui/CMakeLists.txt @@ -44,33 +44,17 @@ SET(StartGui_SRCS Workbench.h ) -add_library(StartGui SHARED ${StartGui_SRCS}) -target_link_libraries(StartGui ${StartGui_LIBS}) - -fc_target_copy_resource(StartGui - ${CMAKE_SOURCE_DIR}/src/Mod/Start - ${CMAKE_BINARY_DIR}/Mod/Start - InitGui.py) - -fc_target_copy_resource(StartGui - ${CMAKE_SOURCE_DIR}/src/Mod/Start/StartPage - ${CMAKE_BINARY_DIR}/Mod/Start/StartPage - ${StartPage_Scripts}) - -fc_target_copy_resource(StartGui - ${CMAKE_SOURCE_DIR}/src/Mod/Start/StartPage - ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage - ${StartPage_Resources}) - -SET_BIN_DIR(StartGui StartGui /Mod/Start) -SET_PYTHON_PREFIX_SUFFIX(StartGui) - -INSTALL(TARGETS StartGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) - SET(StartGuiIcon_SVG Resources/icons/StartWorkbench.svg ) +add_library(StartGui SHARED ${StartGui_SRCS} ${StartGuiIcon_SVG}) +target_link_libraries(StartGui ${StartGui_LIBS}) + +SET_BIN_DIR(StartGui StartGui /Mod/Start) +SET_PYTHON_PREFIX_SUFFIX(StartGui) + fc_copy_sources(StartGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start" ${StartGuiIcon_SVG}) +INSTALL(TARGETS StartGui DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL(FILES ${StartGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Start/Resources/icons") diff --git a/src/Mod/Start/StartPage/CMakeLists.txt b/src/Mod/Start/StartPage/CMakeLists.txt index 7c8a47a2d9..57b482be15 100644 --- a/src/Mod/Start/StartPage/CMakeLists.txt +++ b/src/Mod/Start/StartPage/CMakeLists.txt @@ -1,4 +1,23 @@ +add_custom_target(StartPage ALL + SOURCES ${StartPage_Scripts} ${StartPage_Resources} +) + +fc_target_copy_resource(StartPage + ${CMAKE_SOURCE_DIR}/src/Mod/Start + ${CMAKE_BINARY_DIR}/Mod/Start + ${Start_Scripts}) + +fc_target_copy_resource(StartPage + ${CMAKE_SOURCE_DIR}/src/Mod/Start/StartPage + ${CMAKE_BINARY_DIR}/Mod/Start/StartPage + ${StartPage_Scripts}) + +fc_target_copy_resource(StartPage + ${CMAKE_SOURCE_DIR}/src/Mod/Start/StartPage + ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage + ${StartPage_Resources}) + INSTALL(FILES ${StartPage_Scripts} DESTINATION Mod/Start/StartPage )