From e8ee9e4b3a74a04abfacf880f7e024a47835d457 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 30 Apr 2015 13:42:30 -0700
Subject: [PATCH] try performing copy in PRE_BUILD for VS

---
 cmake/macros/SetupHifiProject.cmake                   | 2 +-
 cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake | 4 ++--
 domain-server/CMakeLists.txt                          | 6 ------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
index 4b3cf5b37c..710077621e 100644
--- a/cmake/macros/SetupHifiProject.cmake
+++ b/cmake/macros/SetupHifiProject.cmake
@@ -23,7 +23,7 @@ macro(SETUP_HIFI_PROJECT)
   endforeach()
   
   # add the executable, include additional optional sources
-  add_executable(${TARGET_NAME} ${TARGET_SRCS} ${TARGET_RSRCS} "${AUTOMTC_SRC}" )
+  add_executable(${TARGET_NAME} ${TARGET_SRCS} "${AUTOMTC_SRC}" )
   
   set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
   list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
diff --git a/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake b/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake
index d64e6821e3..6e82358e35 100644
--- a/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake
+++ b/cmake/macros/SymlinkOrCopyDirectoryBesideTarget.cmake
@@ -21,13 +21,13 @@ macro(SYMLINK_OR_COPY_DIRECTORY_BESIDE_TARGET _SHOULD_SYMLINK _DIRECTORY _DESTIN
   else ()
     # remove the current directory
     add_custom_command(
-      TARGET ${TARGET_NAME} POST_BUILD
+      TARGET ${TARGET_NAME} PRE_BUILD
       COMMAND "${CMAKE_COMMAND}" -E remove_directory $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
     )
 
     # copy the directory
     add_custom_command(
-      TARGET ${TARGET_NAME} POST_BUILD 
+      TARGET ${TARGET_NAME} PRE_BUILD 
       COMMAND ${CMAKE_COMMAND} -E copy_directory ${_DIRECTORY} 
         $<TARGET_FILE_DIR:${TARGET_NAME}>/${_DESTINATION}
     )
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 9c7e6569b2..0595144e93 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -6,12 +6,6 @@ else ()
   set(_SHOULD_SYMLINK_RESOURCES FALSE)
 endif ()
 
-if (NOT ${_SHOULD_SYMLINK_RESOURCES}) 
-  # since we aren't going to symlink the resources, we should add them as sources for this target
-  # this should cause the target to be re-built should one of the files change
-  file(GLOB_RECURSE TARGET_RSRCS "${CMAKE_CURRENT_SOURCE_DIR}/resources/*")
-endif ()
-
 # setup the project and link required Qt modules
 setup_hifi_project(Network)