From 27419b7b6b9b8b7bbb089f771ac07419159e6ae1 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 8 Aug 2014 12:41:41 -0700 Subject: [PATCH] fix some build blockers in test directory --- libraries/shared/src/MovingMinMaxAvg.h | 1 + tests/metavoxels/CMakeLists.txt | 2 ++ tests/networking/src/SequenceNumberStatsTests.cpp | 7 ++++--- tests/octree/CMakeLists.txt | 6 ++++-- tests/physics/CMakeLists.txt | 2 ++ tests/shared/CMakeLists.txt | 2 ++ 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/libraries/shared/src/MovingMinMaxAvg.h b/libraries/shared/src/MovingMinMaxAvg.h index 734018b469..7d4b3df124 100644 --- a/libraries/shared/src/MovingMinMaxAvg.h +++ b/libraries/shared/src/MovingMinMaxAvg.h @@ -12,6 +12,7 @@ #ifndef hifi_MovingMinMaxAvg_h #define hifi_MovingMinMaxAvg_h +#include #include #include "RingBufferHistory.h" diff --git a/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt index 6432b9a259..0fad728764 100644 --- a/tests/metavoxels/CMakeLists.txt +++ b/tests/metavoxels/CMakeLists.txt @@ -2,6 +2,8 @@ set(TARGET_NAME metavoxel-tests) auto_mtc(${TARGET_NAME} "${ROOT_DIR}") +include_glm(${TARGET_NAME}) + setup_hifi_project(${TARGET_NAME} Network Script Widgets) # link in the shared libraries diff --git a/tests/networking/src/SequenceNumberStatsTests.cpp b/tests/networking/src/SequenceNumberStatsTests.cpp index 901a018235..ded67b1ab6 100644 --- a/tests/networking/src/SequenceNumberStatsTests.cpp +++ b/tests/networking/src/SequenceNumberStatsTests.cpp @@ -9,11 +9,12 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#include "SequenceNumberStatsTests.h" - -#include "SharedUtil.h" +#include #include +#include + +#include "SequenceNumberStatsTests.h" void SequenceNumberStatsTests::runAllTests() { rolloverTest(); diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index e9a06bd1c1..baae258643 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -1,9 +1,11 @@ set(TARGET_NAME octree-tests) -setup_hifi_project(${TARGET_NAME}) +setup_hifi_project(${TARGET_NAME} Script Network) + +include_glm(${TARGET_NAME}) # link in the shared libraries -link_hifi_libraries(${TARGET_NAME} octree) +link_hifi_libraries(${TARGET_NAME} animation fbx models networking octree shared) # link any shared dependencies link_shared_dependencies_to_target(${TARGET_NAME}) \ No newline at end of file diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt index 74049b158b..e2affa7b47 100644 --- a/tests/physics/CMakeLists.txt +++ b/tests/physics/CMakeLists.txt @@ -2,6 +2,8 @@ set(TARGET_NAME physics-tests) setup_hifi_project(${TARGET_NAME}) +include_glm(${TARGET_NAME}) + # link in the shared libraries link_hifi_libraries(${TARGET_NAME} shared) diff --git a/tests/shared/CMakeLists.txt b/tests/shared/CMakeLists.txt index 294a60d130..f819a2734b 100644 --- a/tests/shared/CMakeLists.txt +++ b/tests/shared/CMakeLists.txt @@ -2,6 +2,8 @@ set(TARGET_NAME shared-tests) setup_hifi_project(${TARGET_NAME}) +include_glm(${TARGET_NAME}) + # link in the shared libraries link_hifi_libraries(${TARGET_NAME} shared)