Support of INSTALL target on Windows (VC++ and MinGW)

CMakeLists.txt

@@ -59,17 +59,24 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
 # Output directories for install target
 
 if(WIN32)
-    SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
+    SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH "Installation root directory")
 else(WIN32)
     SET(CMAKE_INSTALL_PREFIX "/usr/lib${LIB_SUFFIX}/freecad" CACHE PATH "Installation root directory")
     SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
 endif(WIN32)
 
-
 SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files")
 SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files")
 SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files")
 
+# used as compiler defines
+SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
+SET(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
+
+MESSAGE("prefix: ${CMAKE_INSTALL_PREFIX}")
+MESSAGE("datadir: ${CMAKE_INSTALL_DATADIR}")
+MESSAGE("docdir: ${CMAKE_INSTALL_DOCDIR}")
+MESSAGE("includedir: ${CMAKE_INSTALL_INCLUDEDIR}")
 
 # ==============================================================================
 # == Win32 is default behaviour use the LibPack copied in Source tree ==========
@@ -89,8 +96,6 @@ OPTION(FREECAD_MAINTAINERS_BUILD "Build FreeCAD for Maintainers, with Docu and 3
 OPTION(FREECAD_BUILD_CAM "Build the FreeCAD CAM module and the needed libs, be aware, unfinished code!" OFF)
 OPTION(FREECAD_BUILD_FEM "Build the FreeCAD FEM module, be aware, unfinished code!" ON)
 OPTION(FREECAD_BUILD_SANDBOX "Build the FreeCAD Sandbox module which is only for testing purposes" OFF)
-SET(RESOURCEDIR "${CMAKE_INSTALL_PREFIX}/data" CACHE PATH "Absolute path to the data directory.")
-SET(DOCDIR "" CACHE PATH "Absolute path to the documentation directory.")
 
 # ==============================================================================
 
@@ -473,6 +478,7 @@ if(FREECAD_MAINTAINERS_BUILD AND NOT WIN32)
 	#ADD_CUSTOM_TARGET(DIST make package_source)
 
 endif(FREECAD_MAINTAINERS_BUILD AND NOT WIN32)
+    #add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
     add_custom_target(dist-git
             COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py
               --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR}

cMake/FreeCadMacros.cmake

@@ -38,37 +38,9 @@ ENDFOREACH(SRC ${FILES})
 SET(${TARGETS} ${AddTargets})
 ENDMACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR FILES TARGETS TAGS)
 
-MACRO (fc_copy_to_mod_path mod_name )
+MACRO (fc_copy_sources target_name outpath)
-
-	FOREACH (it ${ARGN})
-		file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${it}" NATIVE_SOURCE)
-		file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/Mod/${mod_name}/" NATIVE_DEST)
-		message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEST}")
-		if (WIN32)
-		else (WIN32)
-			execute_process( COMMAND ${PLATFORM_MK} ${NATIVE_DEST} )
-		endif (WIN32)
-		execute_process( COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEST} )
-	ENDFOREACH(it)
-ENDMACRO(fc_copy_to_mod_path)
-
-MACRO (fc_copy_to_path path_name)
-
-	FOREACH (it ${ARGN})
-		file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${it}" NATIVE_SOURCE)
-		file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/${path_name}/" NATIVE_DEST)
-		message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEST}")
-		if (WIN32)
-		else (WIN32)
-			execute_process( COMMAND ${PLATFORM_MK} ${NATIVE_DEST} )
-		endif (WIN32)
-		execute_process( COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEST} )
-	ENDFOREACH(it)
-ENDMACRO(fc_copy_to_path)
-
-MACRO (fc_copy_sources path_name mod_name)
 	foreach(it ${ARGN})
-		file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/${path_name}/${it}" outfile)
+		file(TO_NATIVE_PATH "${outpath}/${it}" outfile)
 		get_filename_component(infile ${it} ABSOLUTE)
 		get_filename_component(outfile ${outfile} ABSOLUTE)
 		add_file_dependencies(${infile} ${outfile})
@@ -76,42 +48,21 @@ MACRO (fc_copy_sources path_name mod_name)
 			SOURCE    ${infile}
 			COMMAND   ${CMAKE_COMMAND}
 			ARGS      -E copy ${infile} ${outfile}
-			TARGET    ${mod_name}
+			TARGET    ${target_name}
 			OUTPUTS   ${outfile}
 		)
 	endforeach(it)
 	ADD_CUSTOM_COMMAND(
-		SOURCE    ${mod_name}
+		SOURCE    ${target_name}
-		TARGET    ${mod_name}
+		TARGET    ${target_name}
 		DEPENDS   ${ARGN}
 	)
 ENDMACRO(fc_copy_sources)
 
-MACRO (fc_copy_sources_outpath out_path mod_name)
+MACRO (fc_target_copy_resource target_name inpath outpath)
 	foreach(it ${ARGN})
-		file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/${out_path}/${it}" outfile)
+		file(TO_NATIVE_PATH "${inpath}/${it}" infile)
-		get_filename_component(infile ${it} ABSOLUTE)
+		file(TO_NATIVE_PATH "${outpath}/${it}" outfile)
-		get_filename_component(outfile ${outfile} ABSOLUTE)
-		add_file_dependencies(${infile} ${outfile})
-		ADD_CUSTOM_COMMAND(
-			SOURCE    ${infile}
-			COMMAND   ${CMAKE_COMMAND}
-			ARGS      -E copy ${infile} ${outfile}
-			TARGET    ${mod_name}
-			OUTPUTS   ${outfile}
-		)
-	endforeach(it)
-	ADD_CUSTOM_COMMAND(
-		SOURCE    ${mod_name}
-		TARGET    ${mod_name}
-		DEPENDS   ${ARGN}
-	)
-ENDMACRO(fc_copy_sources_outpath)
-
-MACRO (fc_copy_script path_name mod_name)
-	foreach(it ${ARGN})
-		file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}/src/${path_name}/${it}" infile)
-		file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/${path_name}/${it}" outfile)
 		get_filename_component(infile ${infile} ABSOLUTE)
 		get_filename_component(outfile ${outfile} ABSOLUTE)
 		add_file_dependencies(${infile} ${outfile})
@@ -119,16 +70,16 @@ MACRO (fc_copy_script path_name mod_name)
 			SOURCE    ${infile}
 			COMMAND   ${CMAKE_COMMAND}
 			ARGS      -E copy ${infile} ${outfile}
-			TARGET    ${mod_name}
+			TARGET    ${target_name}
 			OUTPUTS   ${outfile}
 		)
 	endforeach(it)
 	ADD_CUSTOM_COMMAND(
-		SOURCE    ${mod_name}
+		SOURCE    ${target_name}
-		TARGET    ${mod_name}
+		TARGET    ${target_name}
 		DEPENDS   ${ARGN}
 	)
-ENDMACRO(fc_copy_script)
+ENDMACRO(fc_target_copy_resource)
 
 macro(copy_to_local_output_paths SOURCE_PATHS)
 		 if(CMAKE_CFG_INTDIR STREQUAL .)

data/examples/CMakeLists.txt

@@ -11,7 +11,7 @@ ADD_CUSTOM_TARGET(Example_data ALL
     SOURCES ${Examples_Files}
 )
 
-fc_copy_sources("data/examples" "Examples" ${Examples_Files})
+fc_copy_sources(Examples "${CMAKE_BINARY_DIR}/data/examples" ${Examples_Files})
 
 INSTALL(
     FILES

src/3rdParty/Pivy-0.5/CMakeLists.txt

@@ -56,15 +56,16 @@ else(MSVC)
     set_target_properties(coin PROPERTIES OUTPUT_NAME "_coin")
     set_target_properties(coin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy)
     set_target_properties(coin PROPERTIES PREFIX "")
-    install(TARGETS coin DESTINATION bin/pivy)
+    set_target_properties(coin PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin/pivy)
 endif(MSVC)
 
-fc_copy_sources_outpath("bin/pivy" "coin"
+fc_copy_sources(coin "${CMAKE_BINARY_DIR}/bin/pivy"
     __init__.py
     coin.py
     sogui.py
 )
 
+install(TARGETS coin DESTINATION bin/pivy)
 install(FILES __init__.py coin.py sogui.py DESTINATION bin/pivy)
 
 ########################### SoQtPy ###########################
@@ -113,11 +114,13 @@ else(MSVC)
     set_target_properties(soqt PROPERTIES OUTPUT_NAME "_soqt")
     set_target_properties(soqt PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy/gui)
     set_target_properties(soqt PROPERTIES PREFIX "")
+    set_target_properties(soqt PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin/pivy/gui)
 endif(MSVC)
 
-fc_copy_sources_outpath("bin/pivy" "soqt"
+fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy"
     gui/soqt.py
     gui/__init__.py
 )
 
+install(TARGETS soqt DESTINATION bin/pivy/gui)
 install(FILES __init__.py soqt.py DESTINATION bin/pivy/gui)

src/3rdParty/Pivy/CMakeLists.txt

@@ -56,14 +56,16 @@ else(MSVC)
     set_target_properties(coin PROPERTIES OUTPUT_NAME "_coin")
     set_target_properties(coin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy)
     set_target_properties(coin PROPERTIES PREFIX "")
+    set_target_properties(coin PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin/pivy)
 endif(MSVC)
 
-fc_copy_sources_outpath("bin/pivy" "coin"
+fc_copy_sources(coin "${CMAKE_BINARY_DIR}/bin/pivy"
     __init__.py
     coin.py
     sogui.py
 )
 
+install(TARGETS coin DESTINATION bin/pivy)
 install(FILES __init__.py coin.py sogui.py DESTINATION bin/pivy)
 
 ########################### SoQtPy ###########################
@@ -112,11 +114,13 @@ else(MSVC)
     set_target_properties(soqt PROPERTIES OUTPUT_NAME "_soqt")
     set_target_properties(soqt PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/pivy/gui)
     set_target_properties(soqt PROPERTIES PREFIX "")
+    set_target_properties(soqt PROPERTIES INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/bin/pivy/gui)
 endif(MSVC)
 
-fc_copy_sources_outpath("bin/pivy" "soqt"
+fc_copy_sources(soqt "${CMAKE_BINARY_DIR}/bin/pivy"
     gui/soqt.py
     gui/__init__.py
 )
 
+install(TARGETS soqt DESTINATION bin/pivy/gui)
 install(FILES __init__.py gui/soqt.py DESTINATION bin/pivy/gui)

src/App/Application.cpp

@@ -102,6 +102,7 @@
 #include <boost/signals.hpp>
 #include <boost/bind.hpp>
 #include <boost/version.hpp>
+#include <QDir>
 
 using namespace App;
 using namespace std;
@@ -482,7 +483,13 @@ std::string Application::getUserAppDataDir()
 std::string Application::getResourceDir()
 {
 #ifdef RESOURCEDIR
-    return std::string(RESOURCEDIR) + "/";
+    std::string path(RESOURCEDIR);
+    path.append("/");
+    QDir dir(QString::fromUtf8(RESOURCEDIR));
+    if (dir.isAbsolute())
+        return path;
+    else
+        return mConfig["AppHomePath"] + path;
 #else
     return mConfig["AppHomePath"];
 #endif
@@ -491,7 +498,13 @@ std::string Application::getResourceDir()
 std::string Application::getHelpDir()
 {
 #ifdef DOCDIR
-    return std::string(DOCDIR) + "/";
+    std::string path(DOCDIR);
+    path.append("/");
+    QDir dir(QString::fromUtf8(DOCDIR));
+    if (dir.isAbsolute())
+        return path;
+    else
+        return mConfig["AppHomePath"] + path;
 #else
     return mConfig["DocPath"];
 #endif

src/App/CMakeLists.txt

@@ -4,13 +4,13 @@ if(WIN32)
 endif(WIN32)
 
 # This causes some problems with the resource files to be found, especially with the StartPage
-#IF(RESOURCEDIR)
+IF(RESOURCEDIR)
-#    add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
+    add_definitions(-DRESOURCEDIR="${RESOURCEDIR}")
-#ENDIF(RESOURCEDIR)
+ENDIF(RESOURCEDIR)
 
-#IF(DOCDIR)
+IF(DOCDIR)
-#    add_definitions(-DDOCDIR="${DOCDIR}")
+    add_definitions(-DDOCDIR="${DOCDIR}")
-#ENDIF(DOCDIR)
+ENDIF(DOCDIR)
 
 include_directories(
     ${CMAKE_BINARY_DIR}/src

src/Mod/Arch/CMakeLists.txt

@@ -28,7 +28,7 @@ ADD_CUSTOM_TARGET(Arch ALL
     SOURCES ${all_files}
 )
 
-fc_copy_sources("Mod/Arch" "Arch" ${all_files})
+fc_copy_sources(Arch "${CMAKE_BINARY_DIR}/Mod/Arch" ${all_files})
 
 INSTALL(
     FILES ${Arch_SRCS}

src/Mod/Assembly/App/CMakeLists.txt

@@ -23,7 +23,12 @@ SET(Assembly_SRCS
 
 add_library(Assembly SHARED ${Assembly_SRCS})
 target_link_libraries(Assembly ${Assembly_LIBS})
-fc_copy_script("Mod/Assembly" "Assembly" Init.py)
+
+
+fc_target_copy_resource(Assembly 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Assembly
+    ${CMAKE_BINARY_DIR}/Mod/Assembly
+    Init.py)
 
 if(MSVC)
     set_target_properties(Assembly PROPERTIES SUFFIX ".pyd")

src/Mod/Assembly/Gui/CMakeLists.txt

@@ -33,7 +33,12 @@ SET(AssemblyGui_SRCS
 
 add_library(AssemblyGui SHARED ${AssemblyGui_SRCS})
 target_link_libraries(AssemblyGui ${AssemblyGui_LIBS})
-fc_copy_script("Mod/Assembly" "AssemblyGui" InitGui.py)
+
+
+fc_target_copy_resource(AssemblyGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Assembly
+    ${CMAKE_BINARY_DIR}/Mod/Assembly
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(AssemblyGui PROPERTIES SUFFIX ".pyd")

src/Mod/Complete/App/CMakeLists.txt

@@ -23,7 +23,12 @@ SET(Complete_SRCS
 
 add_library(Complete SHARED ${Complete_SRCS})
 target_link_libraries(Complete ${Complete_LIBS})
-fc_copy_script("Mod/Complete" "Complete" Init.py)
+
+
+fc_target_copy_resource(Complete 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Complete
+    ${CMAKE_BINARY_DIR}/Mod/Complete
+    Init.py)
 
 if(MSVC)
     set_target_properties(Complete PROPERTIES SUFFIX ".pyd")

src/Mod/Complete/Gui/CMakeLists.txt

@@ -29,7 +29,12 @@ SET(CompleteGui_SRCS
 
 add_library(CompleteGui SHARED ${CompleteGui_SRCS})
 target_link_libraries(CompleteGui ${CompleteGui_LIBS})
-fc_copy_script("Mod/Complete" "CompleteGui" InitGui.py)
+
+
+fc_target_copy_resource(CompleteGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Complete
+    ${CMAKE_BINARY_DIR}/Mod/Complete
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(CompleteGui PROPERTIES SUFFIX ".pyd")

src/Mod/Draft/CMakeLists.txt

@@ -34,7 +34,7 @@ ADD_CUSTOM_TARGET(Draft ALL
     SOURCES ${all_files}
 )
 
-fc_copy_sources("Mod/Draft" "Draft" ${all_files})
+fc_copy_sources(Draft "${CMAKE_BINARY_DIR}/Mod/Draft" ${all_files})
 
 
 INSTALL(

src/Mod/Drawing/App/CMakeLists.txt

@@ -69,9 +69,21 @@ ENDIF(MSVC)
 
 add_library(Drawing SHARED ${Drawing_SRCS} ${Features_SRCS} ${DrawingAlgos_SRCS})
 target_link_libraries(Drawing ${Drawing_LIBS})
-fc_copy_script("Mod/Drawing" "Drawing" Init.py)
+
-fc_copy_script("Mod/Drawing" "Drawing" DrawingAlgos.py)
+SET(Drawing_Scripts
-fc_copy_script("Mod/Drawing" "Drawing" ${Drawing_Templates})
+    Init.py
+    DrawingAlgos.py
+)
+
+fc_target_copy_resource(Drawing 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Drawing
+    ${CMAKE_BINARY_DIR}/Mod/Drawing
+    ${Drawing_Scripts})
+
+fc_target_copy_resource(Drawing 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Drawing
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Drawing
+    ${Drawing_Templates})
 
 if(MSVC)
     set_target_properties(Drawing PROPERTIES SUFFIX ".pyd")

src/Mod/Drawing/Gui/CMakeLists.txt

@@ -88,7 +88,12 @@ endif(MSVC)
 
 add_library(DrawingGui SHARED ${DrawingGui_SRCS} ${DrawingGuiView_SRCS} ${DrawingGuiViewProvider_SRCS})
 target_link_libraries(DrawingGui ${DrawingGui_LIBS})
-fc_copy_script("Mod/Drawing" "DrawingGui" InitGui.py)
+
+
+fc_target_copy_resource(DrawingGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Drawing
+    ${CMAKE_BINARY_DIR}/Mod/Drawing
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(DrawingGui PROPERTIES SUFFIX ".pyd")

src/Mod/Fem/App/CMakeLists.txt

@@ -64,7 +64,12 @@ SOURCE_GROUP("Module" FILES ${Mod_SRCS})
 
 add_library(Fem SHARED ${Fem_SRCS})
 target_link_libraries(Fem ${Fem_LIBS})
-fc_copy_script("Mod/Fem" "Fem" Init.py convert2TetGen.py)
+
+
+fc_target_copy_resource(Fem 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Fem
+    ${CMAKE_BINARY_DIR}/Mod/Fem
+    Init.py convert2TetGen.py)
 
 if(MSVC)
     set_target_properties(Fem PROPERTIES SUFFIX ".pyd")

src/Mod/Fem/Gui/CMakeLists.txt

@@ -51,7 +51,12 @@ SET(FemGui_SRCS
 
 add_library(FemGui SHARED ${FemGui_SRCS})
 target_link_libraries(FemGui ${FemGui_LIBS})
-fc_copy_script("Mod/Fem" "FemGui" InitGui.py)
+
+
+fc_target_copy_resource(FemGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Fem
+    ${CMAKE_BINARY_DIR}/Mod/Fem
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(FemGui PROPERTIES SUFFIX ".pyd")

src/Mod/Idf/CMakeLists.txt

@@ -49,7 +49,7 @@ ADD_CUSTOM_TARGET(Idf ALL
     SOURCES ${all_files}
 )
 
-fc_copy_sources("Mod/Idf" "Idf" ${all_files})
+fc_copy_sources(Idf "${CMAKE_BINARY_DIR}/Mod/Idf" ${all_files})
 
 INSTALL(
     FILES

src/Mod/Image/App/CMakeLists.txt

@@ -29,7 +29,12 @@ set(Image_SRCS
 
 add_library(Image SHARED ${Image_SRCS})
 target_link_libraries(Image ${Image_LIBS})
-fc_copy_script("Mod/Image" "Image" Init.py)
+
+
+fc_target_copy_resource(Image 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Image
+    ${CMAKE_BINARY_DIR}/Mod/Image
+    Init.py)
 
 if(MSVC)
     set_target_properties(Image PROPERTIES SUFFIX ".pyd")

src/Mod/Image/Gui/CMakeLists.txt

@@ -54,7 +54,12 @@ SET(ImageGui_SRCS
 
 add_library(ImageGui SHARED ${ImageGui_SRCS})
 target_link_libraries(ImageGui ${ImageGui_LIBS})
-fc_copy_script("Mod/Image" "ImageGui" InitGui.py)
+
+
+fc_target_copy_resource(ImageGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Image
+    ${CMAKE_BINARY_DIR}/Mod/Image
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(ImageGui PROPERTIES SUFFIX ".pyd")

src/Mod/Import/Gui/CMakeLists.txt

@@ -40,8 +40,12 @@ SET(ImportGui_SRCS
 
 add_library(ImportGui SHARED ${ImportGui_SRCS})
 target_link_libraries(ImportGui ${ImportGui_LIBS})
-fc_copy_script("Mod/Import" "ImportGui" Init.py)
+
-fc_copy_script("Mod/Import" "ImportGui" InitGui.py)
+
+fc_target_copy_resource(ImportGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Import
+    ${CMAKE_BINARY_DIR}/Mod/Import
+    Init.py InitGui.py)
 
 if(MSVC)
     set_target_properties(ImportGui PROPERTIES SUFFIX ".pyd")

src/Mod/Inspection/App/CMakeLists.txt

@@ -35,7 +35,12 @@ SET(Inspection_SRCS
 
 add_library(Inspection SHARED ${Inspection_SRCS})
 target_link_libraries(Inspection ${Inspection_LIBS})
-fc_copy_script("Mod/Inspection" "Inspection" Init.py)
+
+
+fc_target_copy_resource(Inspection 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Inspection
+    ${CMAKE_BINARY_DIR}/Mod/Inspection
+    Init.py)
 
 if(MSVC)
     set_target_properties(Inspection PROPERTIES SUFFIX ".pyd")

src/Mod/Inspection/Gui/CMakeLists.txt

@@ -52,7 +52,12 @@ SET(InspectionGui_SRCS
 
 add_library(InspectionGui SHARED ${InspectionGui_SRCS})
 target_link_libraries(InspectionGui ${InspectionGui_LIBS})
-fc_copy_script("Mod/Inspection" "InspectionGui" InitGui.py)
+
+
+fc_target_copy_resource(InspectionGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Inspection
+    ${CMAKE_BINARY_DIR}/Mod/Inspection
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(InspectionGui PROPERTIES SUFFIX ".pyd")

src/Mod/Machining_Distortion/CMakeLists.txt

@@ -15,11 +15,11 @@ SET(MachDist_SRCS
 SOURCE_GROUP("" FILES ${MachDist_SRCS})
 
 
-ADD_CUSTOM_TARGET(MachDistortion ALL
+ADD_CUSTOM_TARGET( ALL
     SOURCES ${MachDist_SRCS}
 )
 
-fc_copy_sources("Mod/Machining_Distortion" ${MachDist_SRCS})
+fc_copy_sources(MachDistortion "${CMAKE_BINARY_DIR}/Mod/Machining_Distortion" ${MachDist_SRCS})
 
 
 INSTALL(

src/Mod/Mesh/App/CMakeLists.txt

@@ -331,8 +331,16 @@ endif(MSVC)
 add_library(Mesh SHARED ${Core_SRCS} ${WildMagic4_SRCS} ${Mesh_SRCS})
 target_link_libraries(Mesh ${Mesh_LIBS})
 
-fc_copy_script ("Mod/Mesh" "Mesh" Init.py BuildRegularGeoms.py)
+
-fc_copy_sources("Mod/Mesh" "Mesh" MeshTestsApp.py)
+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)
 
 if(MSVC)
     set_target_properties(Mesh PROPERTIES SUFFIX ".pyd")

src/Mod/Mesh/Gui/CMakeLists.txt

@@ -109,7 +109,12 @@ SET(MeshGui_SRCS
 
 add_library(MeshGui SHARED ${MeshGui_SRCS})
 target_link_libraries(MeshGui ${MeshGui_LIBS})
-fc_copy_script("Mod/Mesh" "MeshGui" InitGui.py)
+
+
+fc_target_copy_resource(MeshGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Mesh
+    ${CMAKE_BINARY_DIR}/Mod/Mesh
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(MeshGui PROPERTIES SUFFIX ".pyd")

src/Mod/MeshPart/App/CMakeLists.txt

@@ -51,7 +51,12 @@ SET(MeshPart_SRCS
 
 add_library(MeshPart SHARED ${MeshPart_SRCS})
 target_link_libraries(MeshPart ${MeshPart_LIBS})
-fc_copy_script("Mod/MeshPart" "MeshPart" Init.py)
+
+
+fc_target_copy_resource(MeshPart 
+    ${CMAKE_SOURCE_DIR}/src/Mod/MeshPart
+    ${CMAKE_BINARY_DIR}/Mod/MeshPart
+    Init.py)
 
 if(MSVC)
     set_target_properties(MeshPart PROPERTIES SUFFIX ".pyd")

src/Mod/MeshPart/Gui/CMakeLists.txt

@@ -54,7 +54,12 @@ SET(MeshPartGui_SRCS
 
 add_library(MeshPartGui SHARED ${MeshPartGui_SRCS})
 target_link_libraries(MeshPartGui ${MeshPartGui_LIBS})
-fc_copy_script("Mod/MeshPart" "MeshPartGui" InitGui.py)
+
+
+fc_target_copy_resource(MeshPartGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/MeshPart
+    ${CMAKE_BINARY_DIR}/Mod/MeshPart
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(MeshPartGui PROPERTIES SUFFIX ".pyd")

src/Mod/Part/App/CMakeLists.txt

@@ -241,7 +241,12 @@ SET(Part_Scripts
 
 add_library(Part SHARED ${Part_SRCS})
 target_link_libraries(Part ${Part_LIBS})
-fc_copy_script("Mod/Part" "Part" ${Part_Scripts})
+
+
+fc_target_copy_resource(Part 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Part
+    ${CMAKE_BINARY_DIR}/Mod/Part
+    ${Part_Scripts})
 
 if(MSVC)
     set_target_properties(Part PROPERTIES SUFFIX ".pyd")

src/Mod/Part/Gui/CMakeLists.txt

@@ -165,7 +165,12 @@ SET(PartGui_Scripts
 
 add_library(PartGui SHARED ${PartGui_SRCS})
 target_link_libraries(PartGui ${PartGui_LIBS})
-fc_copy_script("Mod/Part" "PartGui" ${PartGui_Scripts})
+
+
+fc_target_copy_resource(PartGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Part
+    ${CMAKE_BINARY_DIR}/Mod/Part
+    ${PartGui_Scripts})
 
 if(MSVC)
     set_target_properties(PartGui PROPERTIES SUFFIX ".pyd")

src/Mod/PartDesign/App/CMakeLists.txt

@@ -90,7 +90,12 @@ SET(PartDesign_Scripts
 
 add_library(PartDesign SHARED ${PartDesign_SRCS})
 target_link_libraries(PartDesign ${PartDesign_LIBS})
-fc_copy_script("Mod/PartDesign" "PartDesign" ${PartDesign_Scripts})
+
+
+fc_target_copy_resource(PartDesign 
+    ${CMAKE_SOURCE_DIR}/src/Mod/PartDesign
+    ${CMAKE_BINARY_DIR}/Mod/PartDesign
+    ${PartDesign_Scripts})
 
 if(MSVC)
     set_target_properties(PartDesign PROPERTIES SUFFIX ".pyd")

src/Mod/PartDesign/Gui/CMakeLists.txt

@@ -121,7 +121,12 @@ SET(PartDesignGui_SRCS
 
 add_library(PartDesignGui SHARED ${PartDesignGui_SRCS})
 target_link_libraries(PartDesignGui ${PartDesignGui_LIBS})
-fc_copy_script("Mod/PartDesign" "PartDesignGui" ${PartDesignGui_Scripts})
+
+
+fc_target_copy_resource(PartDesignGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/PartDesign
+    ${CMAKE_BINARY_DIR}/Mod/PartDesign
+    ${PartDesignGui_Scripts})
 
 if(MSVC)
     set_target_properties(PartDesignGui PROPERTIES SUFFIX ".pyd")

src/Mod/Points/App/CMakeLists.txt

@@ -44,7 +44,11 @@ add_library(Points SHARED ${Points_SRCS})
 
 target_link_libraries(Points ${Points_LIBS})
 
-fc_copy_script("Mod/Points" "Points" Init.py)
+
+fc_target_copy_resource(Points 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Points
+    ${CMAKE_BINARY_DIR}/Mod/Points
+    Init.py)
 
 if(MSVC)
     set_target_properties(Points PROPERTIES SUFFIX ".pyd")

src/Mod/Points/Gui/CMakeLists.txt

@@ -54,7 +54,12 @@ SET(PointsGui_SRCS
 
 add_library(PointsGui SHARED ${PointsGui_SRCS})
 target_link_libraries(PointsGui ${PointsGui_LIBS})
-fc_copy_script("Mod/Points" "PointsGui" InitGui.py)
+
+
+fc_target_copy_resource(PointsGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Points
+    ${CMAKE_BINARY_DIR}/Mod/Points
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(PointsGui PROPERTIES SUFFIX ".pyd")

src/Mod/Raytracing/App/CMakeLists.txt

@@ -51,15 +51,27 @@ SET(Raytracing_SRCS
     RaySegment.h
 )
 
+SET(Raytracing_Scripts
+    Init.py
+    RaytracingExample.py
+)
+
 SET(Raytracing_Templates
     Templates/ProjectStd.pov
 )
 
 add_library(Raytracing SHARED ${Raytracing_SRCS})
 target_link_libraries(Raytracing ${Raytracing_LIBS})
-fc_copy_script("Mod/Raytracing" "Raytracing" Init.py)
+
-fc_copy_script("Mod/Raytracing" "Raytracing" RaytracingExample.py)
+fc_target_copy_resource(Raytracing 
-fc_copy_script("Mod/Raytracing" "Raytracing" ${Raytracing_Templates})
+    ${CMAKE_SOURCE_DIR}/src/Mod/Raytracing
+    ${CMAKE_BINARY_DIR}/Mod/Raytracing
+    ${Raytracing_Scripts})
+
+fc_target_copy_resource(Raytracing 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Raytracing
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Raytracing
+    ${Raytracing_Templates})
 
 if(MSVC)
     set_target_properties(Raytracing PROPERTIES SUFFIX ".pyd")

src/Mod/Raytracing/Gui/CMakeLists.txt

@@ -74,7 +74,12 @@ SET(RaytracingGui_SRCS
 
 add_library(RaytracingGui SHARED ${RaytracingGui_SRCS})
 target_link_libraries(RaytracingGui ${RaytracingGui_LIBS})
-fc_copy_script("Mod/Raytracing" "RaytracingGui" InitGui.py)
+
+
+fc_target_copy_resource(RaytracingGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Raytracing
+    ${CMAKE_BINARY_DIR}/Mod/Raytracing
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(RaytracingGui PROPERTIES SUFFIX ".pyd")

src/Mod/ReverseEngineering/App/CMakeLists.txt

@@ -32,7 +32,12 @@ SET(Reen_SRCS
 
 add_library(ReverseEngineering SHARED ${Reen_SRCS})
 target_link_libraries(ReverseEngineering ${Reen_LIBS})
-fc_copy_script("Mod/ReverseEngineering" "ReverseEngineering" Init.py)
+
+
+fc_target_copy_resource(ReverseEngineering 
+    ${CMAKE_SOURCE_DIR}/src/Mod/ReverseEngineering
+    ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering
+    Init.py)
 
 if(MSVC)
     set_target_properties(ReverseEngineering PROPERTIES SUFFIX ".pyd")

src/Mod/ReverseEngineering/Gui/CMakeLists.txt

@@ -39,7 +39,12 @@ SET(ReenGui_SRCS
 
 add_library(ReverseEngineeringGui SHARED ${ReenGui_SRCS})
 target_link_libraries(ReverseEngineeringGui ${ReenGui_LIBS})
-fc_copy_script("Mod/ReverseEngineering" "ReverseEngineeringGui" InitGui.py)
+
+
+fc_target_copy_resource(ReverseEngineeringGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/ReverseEngineering
+    ${CMAKE_BINARY_DIR}/Mod/ReverseEngineering
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(ReverseEngineeringGui PROPERTIES SUFFIX ".pyd")

src/Mod/Robot/App/CMakeLists.txt

@@ -101,6 +101,13 @@ SOURCE_GROUP("KDL" FILES ${KDL_SRCS} ${KDL_HPPS} ${UTIL_SRCS} ${UTIL_HPPS} )
 SOURCE_GROUP("Python" FILES ${Python_SRCS})
 SOURCE_GROUP("Module" FILES ${Mod_SRCS})
 
+SET(Robot_Scripts
+    Init.py
+    KukaExporter.py
+    RobotExample.py
+    RobotExampleTrajectoryOutOfShapes.py
+)
+
 SET(Robot_Resources
     Lib/Kuka/kr500_1.wrl
     Lib/Kuka/kr500_1.csv
@@ -114,15 +121,21 @@ SET(Robot_Resources
     Lib/Kuka/kr125_3.wrl
     Lib/Kuka/kr_125.csv
     Lib/Kuka/kr125_2.pdf
-    KukaExporter.py
-    RobotExample.py
-    RobotExampleTrajectoryOutOfShapes.py
 )
 
 add_library(Robot SHARED ${Robot_SRCS})
 target_link_libraries(Robot ${Robot_LIBS})
-fc_copy_script("Mod/Robot" "Robot" Init.py)
+
-fc_copy_script("Mod/Robot" "Robot" ${Robot_Resources})
+fc_target_copy_resource(Robot 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Robot
+    ${CMAKE_BINARY_DIR}/Mod/Robot
+    ${Robot_Scripts})
+
+fc_target_copy_resource(Robot 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Robot
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Robot
+    ${Robot_Resources})
+
 
 if(MSVC)
     set_target_properties(Robot PROPERTIES SUFFIX ".pyd")

src/Mod/Robot/Gui/CMakeLists.txt

@@ -146,8 +146,12 @@ SET(RobotGui_SRCS
 
 add_library(RobotGui SHARED ${RobotGui_SRCS})
 target_link_libraries(RobotGui ${RobotGui_LIBS})
-fc_copy_script("Mod/Robot" "RobotGui" InitGui.py)
+
-fc_copy_script("Mod/Robot" "RobotGui" MovieTool.py)
+
+fc_target_copy_resource(RobotGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Robot
+    ${CMAKE_BINARY_DIR}/Mod/Robot
+    InitGui.py MovieTool.py)
 
 if(MSVC)
     set_target_properties(RobotGui PROPERTIES SUFFIX ".pyd")

src/Mod/Sandbox/App/CMakeLists.txt

@@ -31,7 +31,12 @@ SET(Sandbox_SRCS
 
 add_library(Sandbox SHARED ${Sandbox_SRCS})
 target_link_libraries(Sandbox ${Sandbox_LIBS})
-fc_copy_script("Mod/Sandbox" "Sandbox" Init.py)
+
+
+fc_target_copy_resource(Sandbox 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Sandbox
+    ${CMAKE_BINARY_DIR}/Mod/Sandbox
+    Init.py)
 
 if(MSVC)
     set_target_properties(Sandbox PROPERTIES SUFFIX ".pyd")

src/Mod/Sandbox/Gui/CMakeLists.txt

@@ -42,7 +42,12 @@ SET(SandboxGui_SRCS
 
 add_library(SandboxGui SHARED ${SandboxGui_SRCS})
 target_link_libraries(SandboxGui ${SandboxGui_LIBS})
-fc_copy_script("Mod/Sandbox" "SandboxGui" InitGui.py)
+
+
+fc_target_copy_resource(SandboxGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Sandbox
+    ${CMAKE_BINARY_DIR}/Mod/Sandbox
+    InitGui.py)
 
 if(MSVC)
     set_target_properties(SandboxGui PROPERTIES SUFFIX ".pyd")

src/Mod/Ship/CMakeLists.txt

@@ -77,7 +77,7 @@ ADD_CUSTOM_TARGET(Ship ALL
     SOURCES ${all_files}
 )
 
-fc_copy_sources("Mod/Ship" "Ship" ${all_files})
+fc_copy_sources(Ship "${CMAKE_BINARY_DIR}/Mod/Ship" ${all_files})
 
 INSTALL(
     FILES

src/Mod/Sketcher/App/CMakeLists.txt

@@ -106,7 +106,12 @@ SET(Sketcher_Scripts
 
 add_library(Sketcher SHARED ${Sketcher_SRCS})
 target_link_libraries(Sketcher ${Sketcher_LIBS})
-fc_copy_script("Mod/Sketcher" "Sketcher" ${Sketcher_Scripts})
+
+
+fc_target_copy_resource(Sketcher 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Sketcher
+    ${CMAKE_BINARY_DIR}/Mod/Sketcher
+    ${Sketcher_Scripts})
 
 if(MSVC)
     set_target_properties(Sketcher PROPERTIES SUFFIX ".pyd")

src/Mod/Sketcher/Gui/CMakeLists.txt

@@ -98,7 +98,12 @@ SET(SketcherGui_Scripts
 
 add_library(SketcherGui SHARED ${SketcherGui_SRCS})
 target_link_libraries(SketcherGui ${SketcherGui_LIBS})
-fc_copy_script("Mod/Sketcher" "SketcherGui" ${SketcherGui_Scripts})
+
+
+fc_target_copy_resource(SketcherGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Sketcher
+    ${CMAKE_BINARY_DIR}/Mod/Sketcher
+    ${SketcherGui_Scripts})
 
 if(MSVC)
     set_target_properties(SketcherGui PROPERTIES SUFFIX ".pyd")

src/Mod/Start/App/CMakeLists.txt

@@ -22,7 +22,12 @@ SET(Start_SRCS
 
 add_library(Start SHARED ${Start_SRCS})
 target_link_libraries(Start ${Start_LIBS})
-fc_copy_script("Mod/Start" "Start" Init.py)
+
+
+fc_target_copy_resource(Start 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Start
+    ${CMAKE_BINARY_DIR}/Mod/Start
+    Init.py)
 
 if(MSVC)
     set_target_properties(Start PROPERTIES SUFFIX ".pyd")

src/Mod/Start/Gui/CMakeLists.txt

@@ -27,8 +27,13 @@ SET(StartGui_SRCS
     Workbench.h
 )
 
-SET(StartPage_Resources
+SET(StartPage_Scripts
+    InitGui.py
     StartPage/StartPage.py
+    StartPage/__init__.py
+)
+
+SET(StartPage_Resources
     StartPage/PartDesign.py
     StartPage/ArchDesign.py
     StartPage/DefaultWorkbench.py
@@ -38,7 +43,6 @@ SET(StartPage_Resources
     StartPage/LoadDrawingExample.py
     StartPage/LoadRobotExample.py
     StartPage/Background.jpg
-    StartPage/__init__.py
     StartPage/FreeCAD.png
     StartPage/ArchDesign.png
     StartPage/PartDesign.png
@@ -54,8 +58,16 @@ SET(StartPage_Resources
 
 add_library(StartGui SHARED ${StartGui_SRCS})
 target_link_libraries(StartGui ${StartGui_LIBS})
-fc_copy_script("Mod/Start" "StartGui" InitGui.py)
+
-fc_copy_script("Mod/Start" "StartGui" ${StartPage_Resources})
+fc_target_copy_resource(StartGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Start
+    ${CMAKE_BINARY_DIR}/Mod/Start
+    ${StartPage_Scripts})
+
+fc_target_copy_resource(StartGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Start
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/Start
+    ${StartPage_Resources})
 
 if(MSVC)
     set_target_properties(StartGui PROPERTIES SUFFIX ".pyd")

src/Mod/Start/StartPage/CMakeLists.txt

@@ -26,7 +26,11 @@ SET(StartPage_DATA
     web.png
 )
 
-INSTALL(FILES ${StartPage_SRCS} ${StartPage_DATA}
+INSTALL(FILES ${StartPage_SRCS}
+    DESTINATION Mod/Start/StartPage
+)
+
+INSTALL(FILES ${StartPage_DATA}
     DESTINATION ${CMAKE_INSTALL_DATADIR}/Mod/Start/StartPage
 )
 

src/Mod/Surfaces/CMakeLists.txt

@@ -69,7 +69,7 @@ ADD_CUSTOM_TARGET(Surfaces ALL
     SOURCES ${all_files}
 )
 
-fc_copy_sources("Mod/Surfaces" "Surfaces" ${all_files})
+fc_copy_sources(Surfaces "${CMAKE_BINARY_DIR}/Mod/Surfaces" ${all_files})
 
 INSTALL(
     FILES

src/Mod/Test/CMakeLists.txt

@@ -18,7 +18,7 @@ ADD_CUSTOM_TARGET(Test ALL
     SOURCES ${Test_SRCS}
 )
 
-fc_copy_sources("Mod/Test" "Test" ${Test_SRCS})
+fc_copy_sources(Test "${CMAKE_BINARY_DIR}/Mod/Test" ${Test_SRCS})
 
 INSTALL(
     FILES

src/Mod/Test/Gui/CMakeLists.txt

@@ -53,7 +53,7 @@ add_library(QtUnitGui SHARED ${TestGui_SRCS})
 target_link_libraries(QtUnitGui ${TestGui_LIBS})
 add_dependencies(QtUnitGui Test)
 
-fc_copy_sources_outpath("Mod/Test" "QtUnitGui" qtunittest.py)
+fc_copy_sources(QtUnitGui "${CMAKE_BINARY_DIR}/Mod/Test" qtunittest.py)
 
 if(MSVC)
     set_target_properties(QtUnitGui PROPERTIES SUFFIX ".pyd")

src/Mod/Web/Gui/CMakeLists.txt

@@ -36,8 +36,12 @@ SOURCE_GROUP("Moc" FILES ${SketcherGui_MOC_SRCS})
 
 add_library(WebGui SHARED ${WebGui_SRCS})
 target_link_libraries(WebGui ${WebGui_LIBS})
-fc_copy_script("Mod/Web" "WebGui" InitGui.py)
+
-fc_copy_script("Mod/Web" "WebGui" Init.py)
+
+fc_target_copy_resource(WebGui 
+    ${CMAKE_SOURCE_DIR}/src/Mod/Web
+    ${CMAKE_BINARY_DIR}/Mod/Web
+    Init.py InitGui.py)
 
 if(MSVC)
     set_target_properties(WebGui PROPERTIES SUFFIX ".pyd")