From 6b2f24a28c8221880b90cd0b3dd9de9b52ed9529 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 20 Aug 2018 22:27:36 +0200 Subject: [PATCH] CMP0050: make Sandbox module aware of cmake policy --- src/Mod/Sandbox/App/CMakeLists.txt | 13 +++++++++---- src/Mod/Sandbox/CMakeLists.txt | 15 +++++++++++---- src/Mod/Sandbox/Gui/CMakeLists.txt | 12 ++++++++---- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt index 96646f3150..7b3b8b59be 100644 --- a/src/Mod/Sandbox/App/CMakeLists.txt +++ b/src/Mod/Sandbox/App/CMakeLists.txt @@ -38,14 +38,19 @@ SET(Sandbox_SRCS PreCompiled.h ) -add_library(Sandbox SHARED ${Sandbox_SRCS}) +set (Sandbox_Scripts + ../Init.py + ../exportDRAWEXE.py +) + +add_library(Sandbox SHARED ${Sandbox_SRCS} ${Sandbox_Scripts}) target_link_libraries(Sandbox ${Sandbox_LIBS}) -fc_target_copy_resource(Sandbox - ${CMAKE_SOURCE_DIR}/src/Mod/Sandbox +fc_target_copy_resource_flat(Sandbox + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Sandbox - Init.py) + ${Sandbox_Scripts}) SET_BIN_DIR(Sandbox Sandbox /Mod/Sandbox) SET_PYTHON_PREFIX_SUFFIX(Sandbox) diff --git a/src/Mod/Sandbox/CMakeLists.txt b/src/Mod/Sandbox/CMakeLists.txt index 8cf7b3404e..25dcb857f6 100644 --- a/src/Mod/Sandbox/CMakeLists.txt +++ b/src/Mod/Sandbox/CMakeLists.txt @@ -1,14 +1,21 @@ add_subdirectory(App) if(BUILD_GUI) - add_subdirectory(Gui) + add_subdirectory(Gui) +endif(BUILD_GUI) + +set(Sandbox_Scripts + Init.py + exportDRAWEXE.py +) + +if(BUILD_GUI) + list (APPEND Sandbox_Scripts InitGui.py) endif(BUILD_GUI) INSTALL( FILES - Init.py - InitGui.py - exportDRAWEXE.py + ${Sandbox_Scripts} DESTINATION Mod/Sandbox ) diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index 2963f18335..67431d322b 100644 --- a/src/Mod/Sandbox/Gui/CMakeLists.txt +++ b/src/Mod/Sandbox/Gui/CMakeLists.txt @@ -66,14 +66,18 @@ SET(SandboxGui_SRCS Workbench.h ) -add_library(SandboxGui SHARED ${SandboxGui_SRCS}) +set (SandboxGui_Scripts + ../InitGui.py +) + +add_library(SandboxGui SHARED ${SandboxGui_SRCS} ${SandboxGui_Scripts}) target_link_libraries(SandboxGui ${SandboxGui_LIBS}) -fc_target_copy_resource(SandboxGui - ${CMAKE_SOURCE_DIR}/src/Mod/Sandbox +fc_target_copy_resource_flat(SandboxGui + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR}/Mod/Sandbox - InitGui.py) + ${SandboxGui_Scripts}) SET_BIN_DIR(SandboxGui SandboxGui /Mod/Sandbox) SET_PYTHON_PREFIX_SUFFIX(SandboxGui)