From 1c656b1cb77eaec2f0fbbe68d3f0e68ae2d1b5cd Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Mon, 20 Aug 2018 13:51:40 +0200
Subject: [PATCH] CMP0050: make Web module aware of cmake policy

---
 src/Mod/Web/App/CMakeLists.txt |  5 -----
 src/Mod/Web/CMakeLists.txt     | 19 +++++++++++++++++--
 src/Mod/Web/Gui/CMakeLists.txt | 23 +++++++++--------------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt
index a9e050655b..3cb32fe305 100644
--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -41,11 +41,6 @@ add_library(Web SHARED ${Web_SRCS})
 target_link_libraries(Web ${Web_LIBS})
 
 
-fc_target_copy_resource(Web 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Web
-    ${CMAKE_BINARY_DIR}/Mod/Web
-    Init.py)
-
 SET_BIN_DIR(Web Web /Mod/Web)
 SET_PYTHON_PREFIX_SUFFIX(Web)
 
diff --git a/src/Mod/Web/CMakeLists.txt b/src/Mod/Web/CMakeLists.txt
index e0c11d989c..3e3ddf4f0c 100644
--- a/src/Mod/Web/CMakeLists.txt
+++ b/src/Mod/Web/CMakeLists.txt
@@ -1,15 +1,30 @@
 
 add_subdirectory(App)
+
+set(Web_Scripts
+    Init.py
+)
+
 if(BUILD_GUI)
     if(Qt5WebKitWidgets_FOUND OR QT_QTWEBKIT_FOUND)
         add_subdirectory(Gui)
+        list (APPEND Web_Scripts InitGui.py)
     endif()
 endif(BUILD_GUI)
 
+add_custom_target(WebScripts ALL
+    SOURCES ${Web_Scripts}
+)
+
+fc_target_copy_resource_flat(WebScripts
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/Web
+    ${Web_Scripts}
+)
+
 INSTALL(
     FILES
-        Init.py
-        InitGui.py
+        ${Web_Scripts}
     DESTINATION
         Mod/Web
 )
diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt
index 1c7b1d17ac..963acbd57c 100644
--- a/src/Mod/Web/Gui/CMakeLists.txt
+++ b/src/Mod/Web/Gui/CMakeLists.txt
@@ -44,24 +44,19 @@ set(WebGui_MOC_HDRS
 fc_wrap_cpp(WebGui_MOC_SRCS ${WebGui_MOC_HDRS})
 SOURCE_GROUP("Moc" FILES ${SketcherGui_MOC_SRCS})
 
-add_library(WebGui SHARED ${WebGui_SRCS})
-target_link_libraries(WebGui ${WebGui_LIBS})
-
-
-fc_target_copy_resource(WebGui 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Web
-    ${CMAKE_BINARY_DIR}/Mod/Web
-    InitGui.py)
-
-SET_BIN_DIR(WebGui WebGui /Mod/Web)
-SET_PYTHON_PREFIX_SUFFIX(WebGui)
-
-INSTALL(TARGETS WebGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
 SET(WebGuiIcon_SVG
     Resources/icons/WebWorkbench.svg
 )
 
+add_library(WebGui SHARED ${WebGui_SRCS} ${WebGuiIcon_SVG})
+target_link_libraries(WebGui ${WebGui_LIBS})
+
+
+SET_BIN_DIR(WebGui WebGui /Mod/Web)
+SET_PYTHON_PREFIX_SUFFIX(WebGui)
+
 fc_copy_sources(WebGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Web" ${WebGuiIcon_SVG})
 
+INSTALL(TARGETS WebGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
 INSTALL(FILES ${WebGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Web/Resources/icons")