CMP0050: make Sketcher module aware of cmake policy

src/Mod/Sketcher/App/CMakeLists.txt

@@ -112,25 +112,10 @@ SET(Sketcher_SRCS
     ${Datatypes_SRCS}
 )
 
-SET(Sketcher_Scripts
-    Init.py
-    SketcherExample.py
-    TestSketcherApp.py
-    Profiles.py
-    ProfileLib/Hexagon.py
-    ProfileLib/RegularPolygon.py
-    ProfileLib/__init__.py
-)
-
 add_library(Sketcher SHARED ${Sketcher_SRCS})
 target_link_libraries(Sketcher ${Sketcher_LIBS})
 
 
-fc_target_copy_resource(Sketcher 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Sketcher
-    ${CMAKE_BINARY_DIR}/Mod/Sketcher
-    ${Sketcher_Scripts})
-
 SET_BIN_DIR(Sketcher Sketcher /Mod/Sketcher)
 SET_PYTHON_PREFIX_SUFFIX(Sketcher)
 

src/Mod/Sketcher/CMakeLists.txt

@@ -4,23 +4,47 @@ if(BUILD_GUI)
     add_subdirectory(Gui)
 endif(BUILD_GUI)
 
+set(Sketcher_Scripts
+    Init.py
+    SketcherExample.py
+    TestSketcherApp.py
+    Profiles.py
+)
+
+if(BUILD_GUI)
+    list (APPEND Sketcher_Scripts
+          InitGui.py
+          TestSketcherGui.py
+    )
+endif(BUILD_GUI)
+
+set(Sketcher_Profiles
+    ProfileLib/Hexagon.py
+    ProfileLib/RegularPolygon.py
+    ProfileLib/__init__.py
+)
+
+add_custom_target(SketcherScripts ALL
+    SOURCES ${Sketcher_Scripts} ${Sketcher_Profiles}
+)
+
+fc_target_copy_resource(SketcherScripts
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}/Mod/Sketcher
+    ${Sketcher_Scripts}
+    ${Sketcher_Profiles}
+)
+
 INSTALL(
     FILES
-        Init.py
-        InitGui.py
-        SketcherExample.py
-        TestSketcherApp.py
-        TestSketcherGui.py
-        Profiles.py
+        ${Sketcher_Scripts}
     DESTINATION
         Mod/Sketcher
 )
 
 INSTALL(
     FILES
-        ProfileLib/Hexagon.py
-        ProfileLib/RegularPolygon.py
-        ProfileLib/__init__.py
+        ${Sketcher_Profiles}
     DESTINATION
         Mod/Sketcher/ProfileLib
 )

src/Mod/Sketcher/Gui/CMakeLists.txt

@@ -138,29 +138,18 @@ SET(SketcherGui_SRCS
     ViewProviderPython.h
 )
 
-SET(SketcherGui_Scripts
-    InitGui.py
-    TestSketcherGui.py
-)
-
-add_library(SketcherGui SHARED ${SketcherGui_SRCS})
-target_link_libraries(SketcherGui ${SketcherGui_LIBS})
-
-
-fc_target_copy_resource(SketcherGui 
-    ${CMAKE_SOURCE_DIR}/src/Mod/Sketcher
-    ${CMAKE_BINARY_DIR}/Mod/Sketcher
-    ${SketcherGui_Scripts})
-
-SET_BIN_DIR(SketcherGui SketcherGui /Mod/Sketcher)
-SET_PYTHON_PREFIX_SUFFIX(SketcherGui)
-
-INSTALL(TARGETS SketcherGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
-
 SET(SketcherGuiIcon_SVG
     Resources/icons/SketcherWorkbench.svg
 )
 
+add_library(SketcherGui SHARED ${SketcherGui_SRCS} ${SketcherGuiIcon_SVG})
+target_link_libraries(SketcherGui ${SketcherGui_LIBS})
+
+
+SET_BIN_DIR(SketcherGui SketcherGui /Mod/Sketcher)
+SET_PYTHON_PREFIX_SUFFIX(SketcherGui)
+
 fc_copy_sources(SketcherGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Sketcher" ${SketcherGuiIcon_SVG})
 
+INSTALL(TARGETS SketcherGui DESTINATION ${CMAKE_INSTALL_LIBDIR})
 INSTALL(FILES ${SketcherGuiIcon_SVG} DESTINATION "${CMAKE_INSTALL_DATADIR}/Mod/Sketcher/Resources/icons")