From 773e1b052279dec71344254b0ce7e91dcf945789 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 18:02:35 -0700 Subject: [PATCH] try to get tests to build --- tests/octree/CMakeLists.txt | 8 ++++---- tests/octree/src/ModelTests.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 1697064ff4..33c3bcd4a3 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -30,12 +30,12 @@ include_glm(${TARGET_NAME} ${ROOT_DIR}) # link in the shared libraries include(${MACRO_DIR}/LinkHifiLibrary.cmake) -link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR}) -link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(models ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(animation ${TARGET_NAME} ${ROOT_DIR}) +link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) IF (WIN32) diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp index 63653dac69..48be5e22c3 100644 --- a/tests/octree/src/ModelTests.cpp +++ b/tests/octree/src/ModelTests.cpp @@ -14,7 +14,7 @@ #include -#if 0 +#if 1 #include #include #include @@ -27,7 +27,7 @@ #include "ModelTests.h" void ModelTests::modelTreeTests(bool verbose) { -#if 0 +#if 1 int testsTaken = 0; int testsPassed = 0; int testsFailed = 0;