From 67ddda714d9f2e227411ffb8579cc6bfa4188133 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Mon, 20 Aug 2018 23:11:32 +0200
Subject: [PATCH] CMP0050: make Assembly module aware of cmake policy

---
 src/Mod/Assembly/App/CMakeLists.txt | 16 ++++++++++------
 src/Mod/Assembly/Gui/CMakeLists.txt | 12 ++++++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt
index 22edd02422..5640dc2b12 100644
--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -102,18 +102,22 @@ SET(Assembly_SRCS
     ${Solver_SRC}
 )
 
-add_library(Assembly SHARED ${Assembly_SRCS})
+SET(Assembly_Scripts
+    ../Init.py
+    ../AssemblyLib.py
+)
+
+add_library(Assembly SHARED ${Assembly_SRCS} ${Assembly_Scripts})
 if(CMAKE_COMPILER_IS_GNUCXX)
-	set_target_properties(Assembly PROPERTIES COMPILE_FLAGS "-fext-numeric-literals")
+    set_target_properties(Assembly PROPERTIES COMPILE_FLAGS "-fext-numeric-literals")
 endif()
 target_link_libraries(Assembly ${Assembly_LIBS} ${log_LIB})
 
 
-fc_target_copy_resource(Assembly 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Assembly
+fc_target_copy_resource_flat(Assembly
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}/Mod/Assembly
-    Init.py
-	AssemblyLib.py)
+    ${Assembly_Scripts})
 
 SET_BIN_DIR(Assembly Assembly /Mod/Assembly)
 SET_PYTHON_PREFIX_SUFFIX(Assembly)
diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt
index b84867d5b4..4f6ee3f94b 100644
--- a/src/Mod/Assembly/Gui/CMakeLists.txt
+++ b/src/Mod/Assembly/Gui/CMakeLists.txt
@@ -92,17 +92,21 @@ SET(AssemblyGui_SRCS
     ${AssemblyGui_UIC_HDRS}
 )
 
-add_library(AssemblyGui SHARED ${AssemblyGui_SRCS})
+SET(AssemblyGui_Scripts
+    ../InitGui.py
+)
+
+add_library(AssemblyGui SHARED ${AssemblyGui_SRCS} ${AssemblyGui_Scripts})
 if(CMAKE_COMPILER_IS_GNUCXX)
 	set_target_properties(AssemblyGui PROPERTIES COMPILE_FLAGS "-fext-numeric-literals")
 endif()
 target_link_libraries(AssemblyGui ${AssemblyGui_LIBS})
 
 
-fc_target_copy_resource(AssemblyGui 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Assembly
+fc_target_copy_resource_flat(AssemblyGui
+    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}/Mod/Assembly
-    InitGui.py)
+    ${AssemblyGui_Scripts})
 
 SET_BIN_DIR(AssemblyGui AssemblyGui /Mod/Assembly)
 SET_PYTHON_PREFIX_SUFFIX(AssemblyGui)