diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cbfbc10ac..ff4d3fb493 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,14 +47,6 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cMake")
 #   set(RELEASE_MAIN_OUTPUT_PATH ${CMAKE_BINARY_DIR}/src/Main/Release)
 #endif(CMAKE_CFG_INTDIR STREQUAL .)
 
-if(WIN32)
-    set(PLATFORM_CP xcopy /Y /S)
-    set(PLATFORM_MK mkdir)
-else(WIN32)
-    set(PLATFORM_CP cp)
-    set(PLATFORM_MK mkdir -p)
-endif(WIN32)
-
 if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
     set(CMAKE_COMPILER_IS_CLANGXX TRUE)
 endif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake
index 4a491f74ea..0b21a6189e 100644
--- a/cMake/FreeCadMacros.cmake
+++ b/cMake/FreeCadMacros.cmake
@@ -3,43 +3,6 @@ include (CheckCXXSourceRuns)
 # ================================================================================
 # == Macros, mostly for special targets ==========================================
 
-MACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR FILES TARGETS TAGS)
-# Macro to implement copy_if_different for a list of files
-# Arguments - 
-#   FROM_DIR - this is the source directory
-#   TO_DIR   - this is the destination directory
-#   FILES    - names of the files to copy 
-#              TODO: add globing. 
-#   TARGETS  - List of targets
-#   TAGS     - Since only the file name is used
-#              to generate rules, pre-pend a user 
-#              supplied tag to prevent duplicate rule errors. 
-SET(AddTargets)
-FOREACH(SRC ${FILES})
-    GET_FILENAME_COMPONENT(SRCFILE ${SRC} NAME) 
-    # Command to copy the files to ${STEP1}/src, if changed.
-    SET(TARGET  "${TAGS}/${SRCFILE}")
-    IF("${FROM_DIR}" STREQUAL "")
-        SET(FROM ${SRC})
-    ELSE("${FROM_DIR}" STREQUAL "")
-        SET(FROM ${FROM_DIR}/${SRC})
-    ENDIF("${FROM_DIR}" STREQUAL "")        
-    IF("${TO_DIR}" STREQUAL "")
-        SET(TO ${SRCFILE})
-    ELSE("${TO_DIR}" STREQUAL "")
-        SET(TO   ${TO_DIR}/${SRCFILE})
-    ENDIF("${TO_DIR}" STREQUAL "")
-    ADD_CUSTOM_COMMAND(
-        OUTPUT  ${TARGET}
-        COMMAND "${CMAKE_COMMAND}"
-        ARGS    -E copy_if_different "${FROM}" "${TO}"
-        COMMENT "Copying ${SRCFILE} ${TO_DIR}"
-        )
-    list(APPEND AddTargets ${TARGET})
-ENDFOREACH(SRC ${FILES})
-SET(${TARGETS} ${AddTargets})
-ENDMACRO(COPY_IF_DIFFERENT FROM_DIR TO_DIR FILES TARGETS TAGS)
-
 MACRO (fc_copy_sources target_name outpath)
 	if(BUILD_VERBOSE_GENERATION)
 		set(fc_details " (fc_copy_sources called from ${CMAKE_CURRENT_SOURCE_DIR})")
@@ -64,6 +27,17 @@ MACRO (fc_copy_sources target_name outpath)
 ENDMACRO(fc_copy_sources)
 
 MACRO (fc_target_copy_resource target_name inpath outpath)
+# Macro to copy a list of files into a nested directory structure
+# Arguments -
+#   target_name - name of the target the files will be added to
+#   inpath      - name of the source directory
+#   outpath     - name of the destination directory
+#   ARGN        - a list of relative file names that will be copied
+#
+#   If a relative file name is foo/bar.txt then the foo directory
+#   part will be kept so that the destination file name will be
+#   ${outpath}/foo/bar.txt
+#
 	if(BUILD_VERBOSE_GENERATION)
 		set(fc_details " (fc_target_copy_resource called from ${CMAKE_CURRENT_SOURCE_DIR})")
 	else()
@@ -86,47 +60,40 @@ MACRO (fc_target_copy_resource target_name inpath outpath)
 	)
 ENDMACRO(fc_target_copy_resource)
 
-macro(copy_to_local_output_paths SOURCE_PATHS)
-		 if(CMAKE_CFG_INTDIR STREQUAL .)
-		 		 # No Debug/Release output paths
-		 		 set(DEBUG_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-		 		 set(RELEASE_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-		 else(CMAKE_CFG_INTDIR STREQUAL .)
-		 		 #set(DEBUG_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/Debug)
-		 		 #set(RELEASE_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/Release)
-		 		 set(DEBUG_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-		 		 set(RELEASE_LOCAL_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
-		 endif(CMAKE_CFG_INTDIR STREQUAL .)
-		 file(TO_NATIVE_PATH ${SOURCE_PATHS} NATIVE_SOURCE)
-		 file(TO_NATIVE_PATH ${DEBUG_LOCAL_OUTPUT_PATH}/ NATIVE_DEBUG_DESTINATION)
-		 file(TO_NATIVE_PATH ${RELEASE_LOCAL_OUTPUT_PATH}/ NATIVE_RELEASE_DESTINATION)
-		 message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEBUG_DESTINATION}")
-		 execute_process(
-		 		 COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEBUG_DESTINATION}
-		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-		 if(NOT ${DEBUG_LOCAL_OUTPUT_PATH} STREQUAL ${RELEASE_LOCAL_OUTPUT_PATH})
-		 		 message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_RELEASE_DESTINATION}")
-		 		 execute_process(
-		 		 		 COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_RELEASE_DESTINATION}
-		 		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-		 endif(NOT ${DEBUG_LOCAL_OUTPUT_PATH} STREQUAL ${RELEASE_LOCAL_OUTPUT_PATH})
-endmacro(copy_to_local_output_paths)
-
-macro(copy_to_main_output_paths SOURCE_PATHS)
-		 file(TO_NATIVE_PATH ${SOURCE_PATHS} NATIVE_SOURCE)
-		 file(TO_NATIVE_PATH ${DEBUG_MAIN_OUTPUT_PATH}/ NATIVE_DEBUG_DESTINATION)
-		 file(TO_NATIVE_PATH ${RELEASE_MAIN_OUTPUT_PATH}/ NATIVE_RELEASE_DESTINATION)
-		 message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEBUG_DESTINATION}")
-		 execute_process(
-		 		 COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_DEBUG_DESTINATION}
-		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-		 if(NOT ${DEBUG_MAIN_OUTPUT_PATH} STREQUAL ${RELEASE_MAIN_OUTPUT_PATH})
-		 		 message(STATUS "${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_RELEASE_DESTINATION}")
-		 		 execute_process(
-		 		 		 COMMAND ${PLATFORM_CP} ${NATIVE_SOURCE} ${NATIVE_RELEASE_DESTINATION}
-		 		 		 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-		 endif(NOT ${DEBUG_MAIN_OUTPUT_PATH} STREQUAL ${RELEASE_MAIN_OUTPUT_PATH})
-endmacro(copy_to_main_output_paths)
+MACRO (fc_target_copy_resource_flat target_name inpath outpath)
+# Macro to copy a list of files into a flat directory structure
+# Arguments -
+#   target_name - name of the target the files will be added to
+#   inpath      - name of the source directory
+#   outpath     - name of the destination directory
+#   ARGN        - a list of relative file names that will be copied
+#
+#   If a relative file name is foo/bar.txt then the foo directory
+#   part will be removed so that the destination file name will be
+#   ${outpath}/bar.txt
+#
+	if(BUILD_VERBOSE_GENERATION)
+		set(fc_details " (fc_target_copy_resource_flat called from ${CMAKE_CURRENT_SOURCE_DIR})")
+	else()
+		set(fc_details "")
+	endif()
+	foreach(it ${ARGN})
+		get_filename_component(infile "${inpath}/${it}" ABSOLUTE)
+		get_filename_component(outfile "${it}" NAME)
+		get_filename_component(outfile "${outpath}/${outfile}" ABSOLUTE)
+		add_file_dependencies("${infile}" "${outfile}")
+		ADD_CUSTOM_COMMAND(
+			COMMAND   "${CMAKE_COMMAND}" -E copy "${infile}" "${outfile}"
+			OUTPUT    "${outfile}"
+			COMMENT "Copying ${infile} to ${outfile}${fc_details}"
+			MAIN_DEPENDENCY "${infile}"
+		)
+	endforeach(it)
+	ADD_CUSTOM_COMMAND(
+		TARGET    ${target_name}
+		DEPENDS   ${ARGN}
+	)
+ENDMACRO(fc_target_copy_resource_flat)
 
 # It would be a bit cleaner to generate these files in ${CMAKE_CURRENT_BINARY_DIR}