From bff245daef6c817e28cb6bca042faf94bbcc4e2f Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 19 Aug 2018 22:56:12 +0200 Subject: [PATCH] add Mesh_Data target to handle scripts files --- src/Mod/Mesh/App/CMakeLists.txt | 10 ---------- src/Mod/Mesh/CMakeLists.txt | 25 +++++++++++++++++++++---- src/Mod/Mesh/Gui/CMakeLists.txt | 5 ----- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index 1f64c340c4..c63ee79657 100644 --- a/src/Mod/Mesh/App/CMakeLists.txt +++ b/src/Mod/Mesh/App/CMakeLists.txt @@ -371,16 +371,6 @@ add_library(Mesh SHARED ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS}) target_link_libraries(Mesh ${Mesh_LIBS}) -fc_target_copy_resource(Mesh - ${CMAKE_SOURCE_DIR}/src/Mod/Mesh - ${CMAKE_BINARY_DIR}/Mod/Mesh - Init.py BuildRegularGeoms.py) - -fc_target_copy_resource(Mesh - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/Mod/Mesh - MeshTestsApp.py) - SET_BIN_DIR(Mesh Mesh /Mod/Mesh) SET_PYTHON_PREFIX_SUFFIX(Mesh) diff --git a/src/Mod/Mesh/CMakeLists.txt b/src/Mod/Mesh/CMakeLists.txt index 7283a44c86..2b6e3f327a 100644 --- a/src/Mod/Mesh/CMakeLists.txt +++ b/src/Mod/Mesh/CMakeLists.txt @@ -4,12 +4,29 @@ if(BUILD_GUI) add_subdirectory(Gui) endif(BUILD_GUI) +set(Mesh_Scripts + Init.py + BuildRegularGeoms.py + App/MeshTestsApp.py +) + +if(BUILD_GUI) + list (APPEND Mesh_Scripts InitGui.py) +endif(BUILD_GUI) + +add_custom_target(Mesh_Data ALL + SOURCES ${Mesh_Scripts} +) + +fc_target_copy_resource_flat(Mesh_Data + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/Mod/Mesh + ${Mesh_Scripts} +) + INSTALL( FILES - Init.py - InitGui.py - BuildRegularGeoms.py - App/MeshTestsApp.py + ${Mesh_Scripts} DESTINATION Mod/Mesh ) diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 9716585872..4dd0826a9c 100644 --- a/src/Mod/Mesh/Gui/CMakeLists.txt +++ b/src/Mod/Mesh/Gui/CMakeLists.txt @@ -146,11 +146,6 @@ add_library(MeshGui SHARED ${MeshGui_SRCS}) target_link_libraries(MeshGui ${MeshGui_LIBS}) -fc_target_copy_resource(MeshGui - ${CMAKE_SOURCE_DIR}/src/Mod/Mesh - ${CMAKE_BINARY_DIR}/Mod/Mesh - InitGui.py) - SET_BIN_DIR(MeshGui MeshGui /Mod/Mesh) SET_PYTHON_PREFIX_SUFFIX(MeshGui)