From 68c19866c426ddfcd308982445868fb0e2cce42b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 17 Feb 2015 17:17:30 -0800 Subject: [PATCH] call dll copy after project deps are setup --- assignment-client/CMakeLists.txt | 2 ++ cmake/macros/SetupHifiProject.cmake | 2 -- domain-server/CMakeLists.txt | 4 +++- gvr-interface/CMakeLists.txt | 4 +++- ice-server/CMakeLists.txt | 4 +++- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index 5475b0fc14..e149a8549e 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -18,3 +18,5 @@ if (UNIX) endif (UNIX) include_dependency_includes() + +copy_dlls_beside_windows_executable() diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake index 8b3bc43101..3f9787faa1 100644 --- a/cmake/macros/SetupHifiProject.cmake +++ b/cmake/macros/SetupHifiProject.cmake @@ -34,6 +34,4 @@ macro(SETUP_HIFI_PROJECT) foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES}) target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE}) endforeach() - - copy_dlls_beside_windows_executable() endmacro() \ No newline at end of file diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index 421a1da2d4..17d2c9185b 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -52,4 +52,6 @@ include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") # append OpenSSL to our list of libraries to link target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES}) -include_dependency_includes() \ No newline at end of file +include_dependency_includes() + +copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt index bdffb1fbd3..20d35fb204 100644 --- a/gvr-interface/CMakeLists.txt +++ b/gvr-interface/CMakeLists.txt @@ -87,4 +87,6 @@ if (ANDROID) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/templates/hockeyapp.xml.in" "${ANDROID_APK_BUILD_DIR}/res/values/hockeyapp.xml") qt_create_apk() -endif (ANDROID) \ No newline at end of file +endif (ANDROID) + +copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/ice-server/CMakeLists.txt b/ice-server/CMakeLists.txt index 6a8ca5bd9f..7224bdc31a 100644 --- a/ice-server/CMakeLists.txt +++ b/ice-server/CMakeLists.txt @@ -6,4 +6,6 @@ setup_hifi_project(Network) # link the shared hifi libraries link_hifi_libraries(embedded-webserver networking shared) -include_dependency_includes() \ No newline at end of file +include_dependency_includes() + +copy_dlls_beside_windows_executable() \ No newline at end of file