From 38ae3afc82c9f37fc314c4d2ae7d4bd1acd405da Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 30 Apr 2015 13:06:00 -0700 Subject: [PATCH] add a macro for directory copying --- cmake/macros/SetupHifiProject.cmake | 2 +- domain-server/CMakeLists.txt | 46 ++++++++++------------------- 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake index 3f9787faa1..1ed0d8a202 100644 --- a/cmake/macros/SetupHifiProject.cmake +++ b/cmake/macros/SetupHifiProject.cmake @@ -34,4 +34,4 @@ macro(SETUP_HIFI_PROJECT) foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES}) target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE}) endforeach() -endmacro() \ No newline at end of file +endmacro() diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index 4ff3c1cce1..c883cf6b6d 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -3,38 +3,22 @@ set(TARGET_NAME domain-server) # setup the project and link required Qt modules setup_hifi_project(Network) -# remove current resources dir -add_custom_command( - TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E remove_directory - $/resources -) -# copy all files in resources, including web -add_custom_command( - TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy_directory - "${PROJECT_SOURCE_DIR}/resources" - $/resources -) - -if (NOT WIN32) - # remove the web directory so we can make it a symlink - add_custom_command( - TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E remove_directory - $/resources/web - ) - - # make the web directory a symlink - add_custom_command( - TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E create_symlink - "${PROJECT_SOURCE_DIR}/resources/web" - $/resources/web - ) - +if (UPPER_CMAKE_BUILD_TYPE MATCHES DEBUG AND NOT WIN32) + set(SHOULD_SYMLINK_RESOURCES FALSE) +else () + set(SHOULD_SYMLINK_RESOURCES FALSE) endif () +copy_directory_beside_target(${SHOULD_SYMLINK_RESOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/resources" "resources") + +# copy all files in resources, including web +# add_custom_command( +# TARGET ${TARGET_NAME} POST_BUILD +# COMMAND "${CMAKE_COMMAND}" -E copy_directory +# "${PROJECT_SOURCE_DIR}/resources" +# $/resources +# ) + # link the shared hifi libraries link_hifi_libraries(embedded-webserver networking shared) @@ -52,4 +36,4 @@ include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") # append OpenSSL to our list of libraries to link target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES}) -copy_dlls_beside_windows_executable() \ No newline at end of file +copy_dlls_beside_windows_executable()