From cd5ee548f6d5bc3c52bb2492f69976c38f4a2626 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 20 Aug 2018 14:56:30 +0200 Subject: [PATCH] CMP0050: make Surface module aware of cmake policy --- src/Mod/Surface/App/CMakeLists.txt | 6 ------ src/Mod/Surface/CMakeLists.txt | 21 +++++++++++++++++++-- src/Mod/Surface/Gui/CMakeLists.txt | 5 ----- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt index 2d7371d99c..78b8a6218e 100644 --- a/src/Mod/Surface/App/CMakeLists.txt +++ b/src/Mod/Surface/App/CMakeLists.txt @@ -37,12 +37,6 @@ link_directories(${OCC_LIBRARY_DIR}) add_library(Surface SHARED ${Surface_SRCS}) target_link_libraries(Surface ${Surface_LIBS}) - -fc_target_copy_resource(Surface - ${CMAKE_SOURCE_DIR}/src/Mod/Surface - ${CMAKE_BINARY_DIR}/Mod/Surface - Init.py) - SET_BIN_DIR(Surface Surface /Mod/Surface) SET_PYTHON_PREFIX_SUFFIX(Surface) diff --git a/src/Mod/Surface/CMakeLists.txt b/src/Mod/Surface/CMakeLists.txt index 9d5db434d7..ce0575e0f1 100644 --- a/src/Mod/Surface/CMakeLists.txt +++ b/src/Mod/Surface/CMakeLists.txt @@ -4,10 +4,27 @@ if(BUILD_GUI) add_subdirectory(Gui) endif(BUILD_GUI) +set(Surface_Scripts + Init.py +) + +if(BUILD_GUI) + list (APPEND Surface_Scripts InitGui.py) +endif(BUILD_GUI) + +add_custom_target(SurfaceScripts ALL + SOURCES ${Surface_Scripts} +) + +fc_target_copy_resource(SurfaceScripts + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/Mod/Surface + ${Surface_Scripts} +) + install( FILES - Init.py - InitGui.py + ${Surface_Scripts} DESTINATION Mod/Surface ) diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt index 7e20fd3d61..87b1579491 100644 --- a/src/Mod/Surface/Gui/CMakeLists.txt +++ b/src/Mod/Surface/Gui/CMakeLists.txt @@ -76,11 +76,6 @@ link_directories(${OCC_LIBRARY_DIR}) add_library(SurfaceGui SHARED ${SurfaceGui_SRCS}) target_link_libraries(SurfaceGui ${SurfaceGui_LIBS}) -fc_target_copy_resource(SurfaceGui - ${CMAKE_SOURCE_DIR}/src/Mod/Surface - ${CMAKE_BINARY_DIR}/Mod/Surface - InitGui.py) - SET_BIN_DIR(SurfaceGui SurfaceGui /Mod/Surface) SET_PYTHON_PREFIX_SUFFIX(SurfaceGui)