From e9dc3c650b57e1610e95b4e7d72b2c022c5e7cbb Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Tue, 8 May 2018 15:31:17 -0700
Subject: [PATCH] Breakup building and testing

---
 cmake/macros/SetupHifiTestCase.cmake | 5 ++---
 tests/CMakeLists.txt                 | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cmake/macros/SetupHifiTestCase.cmake b/cmake/macros/SetupHifiTestCase.cmake
index 6c7d38e19c..b0edb41e36 100644
--- a/cmake/macros/SetupHifiTestCase.cmake
+++ b/cmake/macros/SetupHifiTestCase.cmake
@@ -124,15 +124,14 @@ macro(SETUP_HIFI_TESTCASE)
       # This target will also build + run the other test targets using ctest when built.
 
       add_custom_target(${TEST_TARGET}
-        COMMAND ctest .
         SOURCES ${TEST_PROJ_SRC_FILES}    # display source files under the testcase target
         DEPENDS ${${TEST_PROJ_NAME}_TARGETS})
+
       set_target_properties(${TEST_TARGET} PROPERTIES
+        FOLDER "Tests"
         EXCLUDE_FROM_DEFAULT_BUILD TRUE
         EXCLUDE_FROM_ALL TRUE)
 
-      set_target_properties(${TEST_TARGET} PROPERTIES FOLDER "Tests")
-
       list (APPEND ALL_TEST_TARGETS ${TEST_TARGET})
       set(ALL_TEST_TARGETS "${ALL_TEST_TARGETS}" PARENT_SCOPE)
     else ()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a8b0727e3d..bc11580979 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -27,9 +27,9 @@ set_target_properties("test-extensions" PROPERTIES FOLDER "Tests")
 #   set (ALL_TEST_TARGETS "${ALL_TEST_TARGETS}" PARENT_SCOPE) # copies this back to parent scope
 #
 add_custom_target("all-tests"
-    COMMAND ctest .
     DEPENDS "${ALL_TEST_TARGETS}")
-set_target_properties("all-tests" PROPERTIES FOLDER "hidden/test-targets")
+
 set_target_properties("all-tests" PROPERTIES
+    FOLDER "hidden/test-targets"
     EXCLUDE_FROM_DEFAULT_BUILD TRUE
     EXCLUDE_FROM_ALL TRUE)