From 2fda95ae8fda3cfb7231d2d0c92dee33e9253f8a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 8 Aug 2014 13:06:23 -0700 Subject: [PATCH] repair build of various tools --- domain-server/CMakeLists.txt | 1 - tests/audio/CMakeLists.txt | 1 - tests/jitter/CMakeLists.txt | 1 - tests/metavoxels/CMakeLists.txt | 1 - tests/networking/CMakeLists.txt | 1 - tests/octree/CMakeLists.txt | 1 - tests/physics/CMakeLists.txt | 1 - tests/shared/CMakeLists.txt | 1 - tools/bitstream2json/CMakeLists.txt | 7 +++++-- tools/json2bitstream/CMakeLists.txt | 7 +++++-- tools/mtc/CMakeLists.txt | 1 - voxel-edit/CMakeLists.txt | 5 ++++- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index bc9269b9ce..0fb9d25b5f 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -15,5 +15,4 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD # link the shared hifi libraries link_hifi_libraries(embedded-webserver networking shared) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tests/audio/CMakeLists.txt b/tests/audio/CMakeLists.txt index 3ef87ede28..974b4dcd09 100644 --- a/tests/audio/CMakeLists.txt +++ b/tests/audio/CMakeLists.txt @@ -7,5 +7,4 @@ include_glm() # link in the shared libraries link_hifi_libraries(shared audio networking) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tests/jitter/CMakeLists.txt b/tests/jitter/CMakeLists.txt index 28a312540f..d0b366e7ef 100644 --- a/tests/jitter/CMakeLists.txt +++ b/tests/jitter/CMakeLists.txt @@ -5,5 +5,4 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared networking) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt index 53b6da4301..732c974f95 100644 --- a/tests/metavoxels/CMakeLists.txt +++ b/tests/metavoxels/CMakeLists.txt @@ -9,5 +9,4 @@ setup_hifi_project(Network Script Widgets) # link in the shared libraries link_hifi_libraries(metavoxels networking shared) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tests/networking/CMakeLists.txt b/tests/networking/CMakeLists.txt index 28fdb539b7..a7293226b3 100644 --- a/tests/networking/CMakeLists.txt +++ b/tests/networking/CMakeLists.txt @@ -5,5 +5,4 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared networking) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index b59344f7f0..5d37b51abe 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -7,5 +7,4 @@ include_glm() # link in the shared libraries link_hifi_libraries(animation fbx models networking octree shared) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt index c2c9327fa0..96aaf48860 100644 --- a/tests/physics/CMakeLists.txt +++ b/tests/physics/CMakeLists.txt @@ -7,5 +7,4 @@ include_glm() # link in the shared libraries link_hifi_libraries(shared) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tests/shared/CMakeLists.txt b/tests/shared/CMakeLists.txt index 8fa2a1c3c4..fe3843e9eb 100644 --- a/tests/shared/CMakeLists.txt +++ b/tests/shared/CMakeLists.txt @@ -7,5 +7,4 @@ include_glm() # link in the shared libraries link_hifi_libraries(shared) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tools/bitstream2json/CMakeLists.txt b/tools/bitstream2json/CMakeLists.txt index 5cf833eaef..bc23a1e193 100644 --- a/tools/bitstream2json/CMakeLists.txt +++ b/tools/bitstream2json/CMakeLists.txt @@ -1,5 +1,8 @@ set(TARGET_NAME bitstream2json) -setup_hifi_project() +setup_hifi_project(Widgets Script) + +include_glm() + +link_hifi_libraries(metavoxels) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tools/json2bitstream/CMakeLists.txt b/tools/json2bitstream/CMakeLists.txt index d8619d95a3..91b56c18fd 100644 --- a/tools/json2bitstream/CMakeLists.txt +++ b/tools/json2bitstream/CMakeLists.txt @@ -1,5 +1,8 @@ set(TARGET_NAME json2bitstream) -setup_hifi_project() +setup_hifi_project(Widgets Script) + +include_glm() + +link_hifi_libraries(metavoxels) -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/tools/mtc/CMakeLists.txt b/tools/mtc/CMakeLists.txt index 2a530f3c66..4dfa8421ff 100644 --- a/tools/mtc/CMakeLists.txt +++ b/tools/mtc/CMakeLists.txt @@ -1,5 +1,4 @@ set(TARGET_NAME mtc) setup_hifi_project() -# link any shared dependencies link_shared_dependencies() \ No newline at end of file diff --git a/voxel-edit/CMakeLists.txt b/voxel-edit/CMakeLists.txt index fea2e27ab1..b61ee6d132 100644 --- a/voxel-edit/CMakeLists.txt +++ b/voxel-edit/CMakeLists.txt @@ -2,5 +2,8 @@ set(TARGET_NAME voxel-edit) setup_hifi_project() -# link any shared dependencies +include_glm() + +link_hifi_libraries(networking octree shared voxels) + link_shared_dependencies() \ No newline at end of file