From 26f7b1ba62bf37cb1c0e0f780bac16be7f651d3e Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 8 Aug 2014 11:45:10 -0700
Subject: [PATCH] add macro to link shared dependencies to target

---
 assignment-client/CMakeLists.txt              |  7 +++---
 cmake/macros/LinkHifiLibraries.cmake          | 11 ++++----
 .../LinkSharedDependenciesToTarget.cmake      | 25 +++++++++++++++++++
 cmake/macros/SetupHifiLibrary.cmake           | 15 +++--------
 cmake/macros/SetupHifiProject.cmake           | 21 +++++++++++-----
 domain-server/CMakeLists.txt                  |  2 +-
 libraries/animation/CMakeLists.txt            |  5 +++-
 libraries/audio/CMakeLists.txt                |  5 +++-
 libraries/avatars/CMakeLists.txt              |  5 +++-
 libraries/embedded-webserver/CMakeLists.txt   |  5 +++-
 libraries/fbx/CMakeLists.txt                  |  9 +++----
 libraries/metavoxels/CMakeLists.txt           |  5 +++-
 libraries/models/CMakeLists.txt               |  5 +++-
 libraries/networking/CMakeLists.txt           |  5 +++-
 libraries/octree/CMakeLists.txt               | 14 ++++++-----
 libraries/particles/CMakeLists.txt            |  5 +++-
 libraries/script-engine/CMakeLists.txt        |  5 +++-
 libraries/shared/CMakeLists.txt               |  5 +++-
 libraries/voxels/CMakeLists.txt               | 10 +++++---
 tests/audio/CMakeLists.txt                    |  2 +-
 tests/jitter/CMakeLists.txt                   |  2 +-
 tests/metavoxels/CMakeLists.txt               |  2 +-
 tests/networking/CMakeLists.txt               |  2 +-
 tests/octree/CMakeLists.txt                   |  2 +-
 tests/physics/CMakeLists.txt                  |  2 +-
 tests/shared/CMakeLists.txt                   |  2 +-
 tools/bitstream2json/CMakeLists.txt           |  2 +-
 tools/json2bitstream/CMakeLists.txt           |  2 +-
 tools/mtc/CMakeLists.txt                      |  2 +-
 voxel-edit/CMakeLists.txt                     |  2 +-
 30 files changed, 121 insertions(+), 65 deletions(-)
 create mode 100644 cmake/macros/LinkSharedDependenciesToTarget.cmake

diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index ab448bc5bd..9f8542c42e 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME assignment-client)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
+setup_hifi_project(${TARGET_NAME} Core Gui Network Script Widgets)
 
 include_glm(${TARGET_NAME})
 
@@ -11,8 +11,7 @@ link_hifi_libraries(${TARGET_NAME}
 )
 
 if (UNIX)
-  target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES} ${CMAKE_DL_LIBS})
+  list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK ${CMAKE_DL_LIBS})
 endif (UNIX)
 
-find_package(Qt5 COMPONENTS Gui Network Script Widgets)
-target_link_libraries(${TARGET_NAME} Qt5::Gui Qt5::Network Qt5::Script Qt5::Widgets)
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/cmake/macros/LinkHifiLibraries.cmake b/cmake/macros/LinkHifiLibraries.cmake
index 4c6e2c3215..96c5d82cae 100644
--- a/cmake/macros/LinkHifiLibraries.cmake
+++ b/cmake/macros/LinkHifiLibraries.cmake
@@ -22,13 +22,12 @@ macro(LINK_HIFI_LIBRARIES TARGET)
 
     add_dependencies(${TARGET} ${HIFI_LIBRARY})
   
+    # link the actual library
+    list(APPEND ${TARGET}_LIBRARIES_TO_LINK ${HIFI_LIBRARY})
+    
+    # ask the library what its dynamic dependencies are and link them
     get_target_property(LINKED_TARGET_DEPENDENCY_LIBRARIES ${HIFI_LIBRARY} DEPENDENCY_LIBRARIES)
-  
-    if (LINKED_TARGET_DEPENDENCY_LIBRARIES)
-      target_link_libraries(${TARGET} ${HIFI_LIBRARY} ${LINKED_TARGET_DEPENDENCY_LIBRARIES})
-    else ()
-      target_link_libraries(${TARGET} ${HIFI_LIBRARY})
-    endif ()
+    list(APPEND ${TARGET}_LIBRARIES_TO_LINK ${LINKED_TARGET_DEPENDENCY_LIBRARIES})
     
   endforeach()
   
diff --git a/cmake/macros/LinkSharedDependenciesToTarget.cmake b/cmake/macros/LinkSharedDependenciesToTarget.cmake
new file mode 100644
index 0000000000..42f7109807
--- /dev/null
+++ b/cmake/macros/LinkSharedDependenciesToTarget.cmake
@@ -0,0 +1,25 @@
+# 
+#  LinkHifiLibrary.cmake
+#  cmake/macros
+# 
+#  Copyright 2014 High Fidelity, Inc.
+#  Created by Stephen Birarda on August 8, 2014
+# 
+#  Distributed under the Apache License, Version 2.0.
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+# 
+
+macro(LINK_SHARED_DEPENDENCIES_TO_TARGET TARGET)  
+  if (${TARGET}_LIBRARIES_TO_LINK)
+    list(REMOVE_DUPLICATES ${TARGET}_LIBRARIES_TO_LINK)
+    
+    # link these libraries to our target
+    target_link_libraries(${TARGET} ${${TARGET}_LIBRARIES_TO_LINK})
+  endif ()
+  
+  # we've already linked our Qt modules, but we need to bubble them up to parents
+  list(APPEND ${TARGET}_LIBRARIES_TO_LINK "${${TARGET}_QT_MODULES_TO_LINK}")
+  
+  # set the property on this target so it can be retreived by targets linking to us
+  set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES "${${TARGET}_LIBRARIES_TO_LINK}")
+endmacro(LINK_SHARED_DEPENDENCIES_TO_TARGET _target)
\ No newline at end of file
diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
index 6da3755ea4..73ee208b98 100644
--- a/cmake/macros/SetupHifiLibrary.cmake
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -15,7 +15,7 @@ macro(SETUP_HIFI_LIBRARY TARGET)
   file(GLOB LIB_SRCS src/*.h src/*.cpp)
   set(LIB_SRCS ${LIB_SRCS})
 
-  # create a library and set the property so it can be referenced later  
+  # create a library and set the property so it can be referenced later
   add_library(${TARGET} ${LIB_SRCS} ${AUTOMTC_SRC})
   
   set(QT_MODULES_TO_LINK ${ARGN})
@@ -24,17 +24,10 @@ macro(SETUP_HIFI_LIBRARY TARGET)
   find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK})
   
   foreach(QT_MODULE ${QT_MODULES_TO_LINK})
-    # link this Qt module to ourselves
-    target_link_libraries(${TARGET} Qt5::${QT_MODULE})
-    
     get_target_property(QT_LIBRARY_LOCATION Qt5::${QT_MODULE} LOCATION)
     
-    # add the actual path to the Qt module to a QT_LIBRARIES variable
-    list(APPEND QT_LIBRARIES ${QT_LIBRARY_LOCATION})
+    # add the actual path to the Qt module to our LIBRARIES_TO_LINK variable
+    target_link_libraries(${TARGET} Qt5::${QT_MODULE})
+    list(APPEND ${TARGET}_QT_MODULES_TO_LINK ${QT_LIBRARY_LOCATION})
   endforeach()
-  
-  if (QT_LIBRARIES)
-    set_target_properties(${TARGET} PROPERTIES DEPENDENCY_LIBRARIES "${QT_LIBRARIES}")
-  endif ()
-
 endmacro(SETUP_HIFI_LIBRARY _target)
\ No newline at end of file
diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
index 281aa42650..c680790f02 100644
--- a/cmake/macros/SetupHifiProject.cmake
+++ b/cmake/macros/SetupHifiProject.cmake
@@ -7,7 +7,7 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 
-macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)    
+macro(SETUP_HIFI_PROJECT TARGET)
   project(${TARGET})
   
   # grab the implemenation and header files
@@ -23,10 +23,19 @@ macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)
   endforeach()
   
   # add the executable, include additional optional sources
-  add_executable(${TARGET} ${TARGET_SRCS} ${ARGN})
+  add_executable(${TARGET} ${TARGET_SRCS} "${AUTOMTC_SRC}")
+  
+  set(QT_MODULES_TO_LINK ${ARGN})
+  list(APPEND QT_MODULES_TO_LINK Core)
+  
+  find_package(Qt5 COMPONENTS ${QT_MODULES_TO_LINK})
+  
+  foreach(QT_MODULE ${QT_MODULES_TO_LINK})    
+    target_link_libraries(${TARGET} Qt5::${QT_MODULE})
+    
+    # add the actual path to the Qt module to our LIBRARIES_TO_LINK variable
+    get_target_property(QT_LIBRARY_LOCATION Qt5::${QT_MODULE} LOCATION)
+    list(APPEND ${TARGET}_QT_MODULES_TO_LINK ${QT_LIBRARY_LOCATION})
+  endforeach()
   
-  if (${INCLUDE_QT})
-    find_package(Qt5 COMPONENTS Core)
-    target_link_libraries(${TARGET} Qt5::Core)
-  endif ()
 endmacro()
\ No newline at end of file
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index 7f9dc2db37..3c1d34ba01 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME domain-server)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
+setup_hifi_project(${TARGET_NAME})
 
 # remove and then copy the files for the webserver
 add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
diff --git a/libraries/animation/CMakeLists.txt b/libraries/animation/CMakeLists.txt
index 9c419d9369..19fa087092 100644
--- a/libraries/animation/CMakeLists.txt
+++ b/libraries/animation/CMakeLists.txt
@@ -3,4 +3,7 @@ set(TARGET_NAME animation)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(${TARGET_NAME} Network Script)
 
-link_hifi_libraries(${TARGET_NAME} shared fbx)
\ No newline at end of file
+link_hifi_libraries(${TARGET_NAME} shared fbx)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt
index 354a3772dd..8487f48ad3 100644
--- a/libraries/audio/CMakeLists.txt
+++ b/libraries/audio/CMakeLists.txt
@@ -5,4 +5,7 @@ setup_hifi_library(${TARGET_NAME} Network)
 
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-link_hifi_libraries(${TARGET_NAME} networking shared)
\ No newline at end of file
+link_hifi_libraries(${TARGET_NAME} networking shared)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt
index d05faf3b27..2791589abb 100644
--- a/libraries/avatars/CMakeLists.txt
+++ b/libraries/avatars/CMakeLists.txt
@@ -6,4 +6,7 @@ setup_hifi_library(${TARGET_NAME} Network Script)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 link_hifi_libraries(${TARGET_NAME} shared octree voxels networking)
-include_hifi_library_headers(fbx)
\ No newline at end of file
+include_hifi_library_headers(fbx)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/embedded-webserver/CMakeLists.txt b/libraries/embedded-webserver/CMakeLists.txt
index c299aa654d..b397003133 100644
--- a/libraries/embedded-webserver/CMakeLists.txt
+++ b/libraries/embedded-webserver/CMakeLists.txt
@@ -1,4 +1,7 @@
 set(TARGET_NAME embedded-webserver)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
-setup_hifi_library(${TARGET_NAME} Network)
\ No newline at end of file
+setup_hifi_library(${TARGET_NAME} Network)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index e9658de4a2..d02cc918fc 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -7,12 +7,9 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 link_hifi_libraries(${TARGET_NAME} shared networking octree voxels)
 
-# link ZLIB
 find_package(ZLIB)
-
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
+list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${ZLIB_LIBRARIES}")
 
-# set a property indicating the libraries we are dependent on and link them to ourselves
-set(DEPENDENCY_LIBRARIES "${ZLIB_LIBRARIES}")
-set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES ${DEPENDENCY_LIBRARIES})
-target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt
index a8d6de698b..b9a03bf0f4 100644
--- a/libraries/metavoxels/CMakeLists.txt
+++ b/libraries/metavoxels/CMakeLists.txt
@@ -8,4 +8,7 @@ setup_hifi_library(${TARGET_NAME} Network Script Widgets)
 # link in the networking library
 link_hifi_libraries(${TARGET_NAME} shared networking)
 
-include_glm(${TARGET_NAME} "${ROOT_DIR}")
\ No newline at end of file
+include_glm(${TARGET_NAME} "${ROOT_DIR}")
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/models/CMakeLists.txt b/libraries/models/CMakeLists.txt
index c0610b0501..89178f193a 100644
--- a/libraries/models/CMakeLists.txt
+++ b/libraries/models/CMakeLists.txt
@@ -5,4 +5,7 @@ setup_hifi_library(${TARGET_NAME} Network Script)
 
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-link_hifi_libraries(${TARGET_NAME} shared octree fbx networking animation)
\ No newline at end of file
+link_hifi_libraries(${TARGET_NAME} shared octree fbx networking animation)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
index fb9f07b81a..c2b86e2218 100644
--- a/libraries/networking/CMakeLists.txt
+++ b/libraries/networking/CMakeLists.txt
@@ -3,4 +3,7 @@ set(TARGET_NAME networking)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(${TARGET_NAME} Network)
 
-link_hifi_libraries(${TARGET_NAME} shared)
\ No newline at end of file
+link_hifi_libraries(${TARGET_NAME} shared)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index 340b2393e6..1fa730aad7 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -7,13 +7,15 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 link_hifi_libraries(${TARGET_NAME} shared networking)
 
-# link ZLIB
+# find ZLIB and OpenSSL
 find_package(ZLIB)
 find_package(OpenSSL REQUIRED)
 
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}" "${OPENSSL_INCLUDE_DIR}")
-  
-# set a property indicating the libraries we are dependent on and link them to ourselves
-set(DEPENDENCY_LIBRARIES "${ZLIB_LIBRARIES}" "${OPENSSL_LIBRARIES}")
-set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_LIBRARIES ${DEPENDENCY_LIBRARIES})
-target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES})
\ No newline at end of file
+
+# append ZLIB and OpenSSL to our list of libraries to link
+list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${ZLIB_LIBRARIES}")
+list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${OPENSSL_LIBRARIES}")
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/particles/CMakeLists.txt b/libraries/particles/CMakeLists.txt
index 2f523b22f7..f306c0a749 100644
--- a/libraries/particles/CMakeLists.txt
+++ b/libraries/particles/CMakeLists.txt
@@ -6,4 +6,7 @@ setup_hifi_library(${TARGET_NAME} Gui Network Script)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 link_hifi_libraries(${TARGET_NAME} shared octree fbx networking animation)
-include_hifi_library_headers(script-engine)
\ No newline at end of file
+include_hifi_library_headers(script-engine)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt
index cce7d8d07b..a16d6270c9 100644
--- a/libraries/script-engine/CMakeLists.txt
+++ b/libraries/script-engine/CMakeLists.txt
@@ -5,4 +5,7 @@ setup_hifi_library(${TARGET_NAME} Gui Network Script Widgets)
 
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-link_hifi_libraries(${TARGET_NAME} shared octree voxels fbx particles models animation)
\ No newline at end of file
+link_hifi_libraries(${TARGET_NAME} shared octree voxels fbx particles models animation)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt
index 9cc1b968dc..1a6b39ea59 100644
--- a/libraries/shared/CMakeLists.txt
+++ b/libraries/shared/CMakeLists.txt
@@ -1,4 +1,7 @@
 set(TARGET_NAME shared)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
-setup_hifi_library(${TARGET_NAME} Network Widgets)
\ No newline at end of file
+setup_hifi_library(${TARGET_NAME} Network Widgets)
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt
index 7f200523de..87841ca29f 100644
--- a/libraries/voxels/CMakeLists.txt
+++ b/libraries/voxels/CMakeLists.txt
@@ -7,10 +7,12 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 link_hifi_libraries(${TARGET_NAME} shared octree networking)
 
-# link ZLIB
+# find ZLIB
 find_package(ZLIB)
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
 
-get_target_property(LINKED_LIBRARIES ${TARGET_NAME} DEPENDENCY_LIBRARIES)
-list(APPEND DEPENDENCY_LIBRARIES "${ZLIB_LIBRARIES}")
-list(REMOVE_DUPLICATES DEPENDENCY_LIBRARIES)
\ No newline at end of file
+# add it to our list of libraries to link
+list(APPEND ${TARGET}_LIBRARIES_TO_LINK "${ZLIB_LIBRARIES}")
+
+# call macro to link our dependencies and bubble them up via a property on our target
+link_shared_dependencies_to_target(${TARGET_NAME})
\ No newline at end of file
diff --git a/tests/audio/CMakeLists.txt b/tests/audio/CMakeLists.txt
index 34d053b008..f5d9388508 100644
--- a/tests/audio/CMakeLists.txt
+++ b/tests/audio/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME audio-tests)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
+setup_hifi_project(${TARGET_NAME})
 
 #include glm
 include_glm(${TARGET_NAME} ${ROOT_DIR})
diff --git a/tests/jitter/CMakeLists.txt b/tests/jitter/CMakeLists.txt
index 4fb3d56492..9c861eac3e 100644
--- a/tests/jitter/CMakeLists.txt
+++ b/tests/jitter/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME jitter-tests)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
+setup_hifi_project(${TARGET_NAME})
 
 # link in the shared libraries
 link_hifi_libraries(${TARGET_NAME} shared networking)
\ No newline at end of file
diff --git a/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt
index d459ea1fed..358a959eb0 100644
--- a/tests/metavoxels/CMakeLists.txt
+++ b/tests/metavoxels/CMakeLists.txt
@@ -4,7 +4,7 @@ find_package(Qt5 COMPONENTS Network Script Widgets)
 
 auto_mtc(${TARGET_NAME} "${ROOT_DIR}")
 
-setup_hifi_project(${TARGET_NAME} TRUE "${AUTOMTC_SRC}")
+setup_hifi_project(${TARGET_NAME})
 
 # link in the shared libraries
 link_hifi_libraries(${TARGET_NAME} metavoxels networking shared)
diff --git a/tests/networking/CMakeLists.txt b/tests/networking/CMakeLists.txt
index ec48bb80cd..68de37a1d2 100644
--- a/tests/networking/CMakeLists.txt
+++ b/tests/networking/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME networking-tests)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
+setup_hifi_project(${TARGET_NAME})
 
 # link in the shared libraries
 link_hifi_libraries(${TARGET_NAME} shared networking)
diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt
index 85442db783..a8e27e0084 100644
--- a/tests/octree/CMakeLists.txt
+++ b/tests/octree/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME octree-tests)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
+setup_hifi_project(${TARGET_NAME})
 
 # link in the shared libraries
 link_hifi_libraries(${TARGET_NAME} octree)
diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt
index 2161723619..01bdf5a96b 100644
--- a/tests/physics/CMakeLists.txt
+++ b/tests/physics/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME physics-tests)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
+setup_hifi_project(${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 bea8448f5e..828559936b 100644
--- a/tests/shared/CMakeLists.txt
+++ b/tests/shared/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(TARGET_NAME shared-tests)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
+setup_hifi_project(${TARGET_NAME})
 
 # link in the shared libraries
 link_hifi_libraries(${TARGET_NAME} shared)
diff --git a/tools/bitstream2json/CMakeLists.txt b/tools/bitstream2json/CMakeLists.txt
index 3b3a65c259..a5077dc181 100644
--- a/tools/bitstream2json/CMakeLists.txt
+++ b/tools/bitstream2json/CMakeLists.txt
@@ -1,2 +1,2 @@
 set(TARGET_NAME bitstream2json)
-setup_hifi_project(${TARGET_NAME} TRUE)
\ No newline at end of file
+setup_hifi_project(${TARGET_NAME})
\ No newline at end of file
diff --git a/tools/json2bitstream/CMakeLists.txt b/tools/json2bitstream/CMakeLists.txt
index 452f845356..28c18f6762 100644
--- a/tools/json2bitstream/CMakeLists.txt
+++ b/tools/json2bitstream/CMakeLists.txt
@@ -1,2 +1,2 @@
 set(TARGET_NAME json2bitstream)
-setup_hifi_project(${TARGET_NAME} TRUE)
\ No newline at end of file
+setup_hifi_project(${TARGET_NAME})
\ No newline at end of file
diff --git a/tools/mtc/CMakeLists.txt b/tools/mtc/CMakeLists.txt
index 467d03d241..0b1c438393 100644
--- a/tools/mtc/CMakeLists.txt
+++ b/tools/mtc/CMakeLists.txt
@@ -1,2 +1,2 @@
 set(TARGET_NAME mtc)
-setup_hifi_project(${TARGET_NAME} TRUE)
\ No newline at end of file
+setup_hifi_project(${TARGET_NAME})
\ No newline at end of file
diff --git a/voxel-edit/CMakeLists.txt b/voxel-edit/CMakeLists.txt
index db22f040b7..5fa4061117 100644
--- a/voxel-edit/CMakeLists.txt
+++ b/voxel-edit/CMakeLists.txt
@@ -1,3 +1,3 @@
 set(TARGET_NAME voxel-edit)
 
-setup_hifi_project(${TARGET_NAME} TRUE)
\ No newline at end of file
+setup_hifi_project(${TARGET_NAME})
\ No newline at end of file