From 7d250136590310b64610fc02ee47aa11537d1f95 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 17 Feb 2015 17:44:58 -0800 Subject: [PATCH] add DLL copying for all project targets --- tests/audio/CMakeLists.txt | 4 +++- tests/jitter/CMakeLists.txt | 4 +++- tests/metavoxels/CMakeLists.txt | 4 +++- tests/networking/CMakeLists.txt | 4 +++- tests/octree/CMakeLists.txt | 2 ++ tests/physics/CMakeLists.txt | 2 ++ tests/render-utils/CMakeLists.txt | 1 + tests/shared/CMakeLists.txt | 4 +++- tools/bitstream2json/CMakeLists.txt | 4 +++- tools/json2bitstream/CMakeLists.txt | 4 +++- tools/mtc/CMakeLists.txt | 4 +++- tools/scribe/CMakeLists.txt | 4 +++- 12 files changed, 32 insertions(+), 9 deletions(-) diff --git a/tests/audio/CMakeLists.txt b/tests/audio/CMakeLists.txt index 62d0ce5be9..a499ecaf1a 100644 --- a/tests/audio/CMakeLists.txt +++ b/tests/audio/CMakeLists.txt @@ -5,4 +5,6 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared audio networking) -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/tests/jitter/CMakeLists.txt b/tests/jitter/CMakeLists.txt index 93f7caefdd..8cfee4b9ad 100644 --- a/tests/jitter/CMakeLists.txt +++ b/tests/jitter/CMakeLists.txt @@ -5,4 +5,6 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared networking) -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/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt index 76f8870b34..1c3cb88328 100644 --- a/tests/metavoxels/CMakeLists.txt +++ b/tests/metavoxels/CMakeLists.txt @@ -7,4 +7,6 @@ setup_hifi_project(Network Script Widgets) # link in the shared libraries link_hifi_libraries(metavoxels 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 diff --git a/tests/networking/CMakeLists.txt b/tests/networking/CMakeLists.txt index 113a75ab50..0e15965966 100644 --- a/tests/networking/CMakeLists.txt +++ b/tests/networking/CMakeLists.txt @@ -5,4 +5,6 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared networking) -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/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 99e3516431..7542e40f87 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -6,3 +6,5 @@ setup_hifi_project(Script Network) link_hifi_libraries(shared octree gpu model fbx metavoxels networking entities avatars audio animation script-engine physics) include_dependency_includes() + +copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt index 0f15f596c0..c4107b9bfc 100644 --- a/tests/physics/CMakeLists.txt +++ b/tests/physics/CMakeLists.txt @@ -11,3 +11,5 @@ include_bullet() link_hifi_libraries(shared physics) include_dependency_includes() + +copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt index 12a9fe5701..3745f904df 100644 --- a/tests/render-utils/CMakeLists.txt +++ b/tests/render-utils/CMakeLists.txt @@ -15,3 +15,4 @@ endif () #link_libraries(animation fbx shared gpu) include_dependency_includes() +copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/shared/CMakeLists.txt b/tests/shared/CMakeLists.txt index 0402d3c74b..8f8d6c425b 100644 --- a/tests/shared/CMakeLists.txt +++ b/tests/shared/CMakeLists.txt @@ -5,4 +5,6 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared) -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/tools/bitstream2json/CMakeLists.txt b/tools/bitstream2json/CMakeLists.txt index 64ffbae5bf..b7b2eb198c 100644 --- a/tools/bitstream2json/CMakeLists.txt +++ b/tools/bitstream2json/CMakeLists.txt @@ -3,4 +3,6 @@ setup_hifi_project(Widgets Script) link_hifi_libraries(metavoxels) -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/tools/json2bitstream/CMakeLists.txt b/tools/json2bitstream/CMakeLists.txt index d69a8dbe17..a258fbf263 100644 --- a/tools/json2bitstream/CMakeLists.txt +++ b/tools/json2bitstream/CMakeLists.txt @@ -3,4 +3,6 @@ setup_hifi_project(Widgets Script) link_hifi_libraries(metavoxels) -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/tools/mtc/CMakeLists.txt b/tools/mtc/CMakeLists.txt index 06b9f86d06..ea21eaf5fc 100644 --- a/tools/mtc/CMakeLists.txt +++ b/tools/mtc/CMakeLists.txt @@ -1,4 +1,6 @@ set(TARGET_NAME mtc) setup_hifi_project() -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/tools/scribe/CMakeLists.txt b/tools/scribe/CMakeLists.txt index e67354cffa..3464809b38 100755 --- a/tools/scribe/CMakeLists.txt +++ b/tools/scribe/CMakeLists.txt @@ -2,4 +2,6 @@ set(TARGET_NAME scribe) setup_hifi_project() # call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +include_dependency_includes() + +copy_dlls_beside_windows_executable() \ No newline at end of file