get to successful cmake after library link macro changes

assignment-client/CMakeLists.txt

@@ -5,19 +5,7 @@ setup_hifi_project(${TARGET_NAME} TRUE)
 include_glm(${TARGET_NAME})
 
 # link in the shared libraries
-link_hifi_library(shared ${TARGET_NAME})
+link_hifi_libraries(${TARGET_NAME} audio avatars octree voxels fbx particles models metavoxels networking animation script-engine embedded-webserver)
-link_hifi_library(audio ${TARGET_NAME})
-link_hifi_library(avatars ${TARGET_NAME})
-link_hifi_library(octree ${TARGET_NAME})
-link_hifi_library(voxels ${TARGET_NAME})
-link_hifi_library(fbx ${TARGET_NAME})
-link_hifi_library(particles ${TARGET_NAME})
-link_hifi_library(models ${TARGET_NAME})
-link_hifi_library(metavoxels ${TARGET_NAME})
-link_hifi_library(networking ${TARGET_NAME})
-link_hifi_library(animation ${TARGET_NAME})
-link_hifi_library(script-engine ${TARGET_NAME})
-link_hifi_library(embedded-webserver ${TARGET_NAME})
 
 if (UNIX)
   target_link_libraries(${TARGET_NAME} ${DEPENDENCY_LIBRARIES} ${CMAKE_DL_LIBS})

cmake/macros/LinkHifiLibraries.cmake

@@ -0,0 +1,34 @@
+# 
+#  LinkHifiLibrary.cmake
+# 
+#  Copyright 2013 High Fidelity, Inc.
+#
+#  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_HIFI_LIBRARIES TARGET LIBRARIES)
+  
+  file(RELATIVE_PATH RELATIVE_LIBRARY_DIR_PATH ${CMAKE_CURRENT_SOURCE_DIR} "${HIFI_LIBRARY_DIR}")
+  
+  foreach(HIFI_LIBRARY ${LIBRARIES})
+    
+    if (NOT TARGET ${HIFI_LIBRARY})
+      add_subdirectory("${RELATIVE_LIBRARY_DIR_PATH}/${HIFI_LIBRARY}" "${RELATIVE_LIBRARY_DIR_PATH}/${HIFI_LIBRARY}")
+    endif ()
+  
+    include_directories("${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src")
+
+    add_dependencies(${TARGET} ${HIFI_LIBRARY})
+  
+    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 ()
+    
+  endforeach()
+  
+endmacro(LINK_HIFI_LIBRARIES _target _libraries)

cmake/macros/LinkHifiLibrary.cmake

@@ -1,30 +0,0 @@
-# 
-#  LinkHifiLibrary.cmake
-# 
-#  Copyright 2013 High Fidelity, Inc.
-#
-#  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_HIFI_LIBRARY LIBRARY TARGET)
-  
-  file(RELATIVE_PATH RELATIVE_LIBRARY_PATH ${CMAKE_CURRENT_SOURCE_DIR} "${HIFI_LIBRARY_DIR}/${LIBRARY}")
-  
-  if (NOT TARGET ${LIBRARY})
-    add_subdirectory(${RELATIVE_LIBRARY_PATH} ${RELATIVE_LIBRARY_PATH})
-  endif ()
-  
-  include_directories("${HIFI_LIBRARY_DIR}/${LIBRARY}/src")
-
-  add_dependencies(${TARGET} ${LIBRARY})
-  
-  get_target_property(LINKED_TARGET_DEPENDENCY_LIBRARIES ${LIBRARY} DEPENDENCY_LIBRARIES)
-  
-  if (LINKED_TARGET_DEPENDENCY_LIBRARIES)
-    target_link_libraries(${TARGET} ${LIBRARY} ${LINKED_TARGET_DEPENDENCY_LIBRARIES})
-  else ()
-    target_link_libraries(${TARGET} ${LIBRARY})
-  endif ()
-  
-endmacro(LINK_HIFI_LIBRARY _library _target)

domain-server/CMakeLists.txt

@@ -12,9 +12,7 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
                   $<TARGET_FILE_DIR:${TARGET_NAME}>/resources/web)
 
 # link the shared hifi library
-link_hifi_library(networking ${TARGET_NAME})
+link_hifi_libraries(${TARGET_NAME} embedded-webserver networking shared)
-link_hifi_library(shared ${TARGET_NAME})
-link_hifi_library(embedded-webserver ${TARGET_NAME})
 
 IF (WIN32)
   target_link_libraries(${TARGET_NAME} Winmm Ws2_32)

interface/CMakeLists.txt

@@ -97,22 +97,8 @@ endif()
 # create the executable, make it a bundle on OS X
 add_executable(${TARGET_NAME} MACOSX_BUNDLE ${INTERFACE_SRCS} ${QM})
 
-# link in the hifi shared library
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-
 # link required hifi libraries
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
+link_hifi_libraries(${TARGET_NAME} shared octree voxels fbx metavoxels networking particles models avatars audio animation script-engine)
-link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(particles ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(models ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(avatars ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(audio ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(animation ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
 
 # find any optional and required libraries
 find_package(Faceplus)

libraries/audio/CMakeLists.txt

@@ -1,24 +1,10 @@
-set(ROOT_DIR ../..)
-set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
 set(TARGET_NAME audio)
 
-find_package(Qt5 COMPONENTS Script)
-include_directories(SYSTEM "${Qt5Script_INCLUDE_DIRS}")
-
-# set up the external glm library
-include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
 
-include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} networking shared)
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 find_package(Qt5 COMPONENTS Network)
 

libraries/metavoxels/CMakeLists.txt

@@ -1,22 +1,12 @@
-set(ROOT_DIR ../..)
-set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
 set(TARGET_NAME metavoxels)
 
-include(${MACRO_DIR}/AutoMTC.cmake)
 auto_mtc(${TARGET_NAME} "${ROOT_DIR}")
 
-include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME} "${AUTOMTC_SRC}")
 
 # link in the networking library
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} networking)
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
-include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
 find_package(Qt5 COMPONENTS Network Script Widgets)

libraries/octree/CMakeLists.txt

@@ -1,20 +1,10 @@
-set(ROOT_DIR ../..)
-set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
 set(TARGET_NAME octree)
 
-include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
 
-include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} "${ROOT_DIR}")
 
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} shared networking)
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
 
 # link ZLIB
 find_package(ZLIB)

libraries/shared/CMakeLists.txt

@@ -1,25 +1,6 @@
-set(ROOT_DIR ../..)
-set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
-
 set(TARGET_NAME shared)
-project(${TARGET_NAME})
-
-include(${MACRO_DIR}/SetupHifiLibrary.cmake)
 setup_hifi_library(${TARGET_NAME})
 
-# include GLM
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} "${ROOT_DIR}")
-
-# link required libraries on UNIX
-if (APPLE)
-  find_library(CoreServices CoreServices)
-  set(DEPENDENCY_LIBRARIES ${CoreServices})
-elseif (UNIX)
-  find_package(Threads REQUIRED)
-  set(DEPENDENCY_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}")
-endif ()
-
 find_package(Qt5 COMPONENTS Network Widgets)
 
 # bubble up the libraries we are dependent on and link them to ourselves

tests/audio/CMakeLists.txt

@@ -1,32 +1,12 @@
 set(TARGET_NAME audio-tests)
 
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-#find_package(Qt5Network REQUIRED)
-#find_package(Qt5Script REQUIRED)
-#find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE)
 
-include(${MACRO_DIR}/AutoMTC.cmake)
-auto_mtc(${TARGET_NAME} ${ROOT_DIR})
-
-#qt5_use_modules(${TARGET_NAME} Network Script Widgets)
-
 #include glm
-include(${MACRO_DIR}/IncludeGLM.cmake)
 include_glm(${TARGET_NAME} ${ROOT_DIR})
 
 # link in the shared libraries
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} shared audio networking)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(audio ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR})
 
 IF (WIN32)
     target_link_libraries(${TARGET_NAME} Winmm Ws2_32)

tests/jitter/CMakeLists.txt

@@ -1,31 +1,9 @@
 set(TARGET_NAME jitter-tests)
 
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-#find_package(Qt5Network REQUIRED)
-#find_package(Qt5Script REQUIRED)
-#find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE)
 
-#include(${MACRO_DIR}/AutoMTC.cmake)
-#auto_mtc(${TARGET_NAME} ${ROOT_DIR})
-
-#qt5_use_modules(${TARGET_NAME} Network Script Widgets)
-
-#include glm - because it's a dependency of shared utils...
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} ${ROOT_DIR})
-
 # link in the shared libraries
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} shared networking)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR})
 
 IF (WIN32)
     target_link_libraries(${TARGET_NAME} Winmm Ws2_32)

tests/metavoxels/CMakeLists.txt

@@ -1,28 +1,13 @@
 set(TARGET_NAME metavoxel-tests)
 
-set(ROOT_DIR ../..)
-set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
 find_package(Qt5 COMPONENTS Network Script Widgets)
 
-include(${MACRO_DIR}/AutoMTC.cmake)
 auto_mtc(${TARGET_NAME} "${ROOT_DIR}")
 
-include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE "${AUTOMTC_SRC}")
 
-#include glm
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} "${ROOT_DIR}")
-
 # link in the shared libraries
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} metavoxels networking shared)
-link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
 
 IF (WIN32)
 	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)

tests/networking/CMakeLists.txt

@@ -1,31 +1,9 @@
 set(TARGET_NAME networking-tests)
 
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-#find_package(Qt5Network REQUIRED)
-#find_package(Qt5Script REQUIRED)
-#find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE)
 
-include(${MACRO_DIR}/AutoMTC.cmake)
-auto_mtc(${TARGET_NAME} ${ROOT_DIR})
-
-#qt5_use_modules(${TARGET_NAME} Network Script Widgets)
-
-#include glm
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} ${ROOT_DIR})
-
 # link in the shared libraries
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} shared networking)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-link_hifi_library(networking ${TARGET_NAME} ${ROOT_DIR})
 
 IF (WIN32)
     target_link_libraries(${TARGET_NAME} Winmm Ws2_32)

tests/octree/CMakeLists.txt

@@ -1,36 +1,9 @@
 set(TARGET_NAME octree-tests)
 
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Script REQUIRED)
-find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE)
 
-include(${MACRO_DIR}/AutoMTC.cmake)
-auto_mtc(${TARGET_NAME} ${ROOT_DIR})
-
-qt5_use_modules(${TARGET_NAME} Network Script Widgets)
-
-#include glm
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} ${ROOT_DIR})
-
 # link in the shared libraries
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} octree)
-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)
     # add a definition for ssize_t so that windows doesn't bail

tests/physics/CMakeLists.txt

@@ -1,32 +1,7 @@
 set(TARGET_NAME physics-tests)
 
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-#find_package(Qt5Network REQUIRED)
-#find_package(Qt5Script REQUIRED)
-#find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE)
 
-include(${MACRO_DIR}/AutoMTC.cmake)
-auto_mtc(${TARGET_NAME} ${ROOT_DIR})
-
-#qt5_use_modules(${TARGET_NAME} Network Script Widgets)
-
-#include glm
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} ${ROOT_DIR})
-
 # link in the shared libraries
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} shared)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-
-IF (WIN32)
-    #target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
-ENDIF(WIN32)
 

tests/shared/CMakeLists.txt

@@ -1,32 +1,6 @@
 set(TARGET_NAME shared-tests)
 
-set(ROOT_DIR ../..)
-set(MACRO_DIR ${ROOT_DIR}/cmake/macros)
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-#find_package(Qt5Network REQUIRED)
-#find_package(Qt5Script REQUIRED)
-#find_package(Qt5Widgets REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE)
 
-include(${MACRO_DIR}/AutoMTC.cmake)
-auto_mtc(${TARGET_NAME} ${ROOT_DIR})
-
-#qt5_use_modules(${TARGET_NAME} Network Script Widgets)
-
-#include glm
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} ${ROOT_DIR})
-
 # link in the shared libraries
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_libraries(${TARGET_NAME} shared)
-link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
-
-IF (WIN32)
-    #target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
-ENDIF(WIN32)
-

tools/bitstream2json/CMakeLists.txt

@@ -1,25 +1,2 @@
 set(TARGET_NAME bitstream2json)
-
+setup_hifi_project(${TARGET_NAME} TRUE)
-set(ROOT_DIR ../..)
-set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-find_package(Qt5 COMPONENTS Network Script Widgets)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
-setup_hifi_project(${TARGET_NAME} TRUE)
-
-link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
-
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} "${ROOT_DIR}")
-
-IF (WIN32)
-    target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
-ENDIF(WIN32)
-
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)

tools/json2bitstream/CMakeLists.txt

@@ -1,25 +1,2 @@
 set(TARGET_NAME json2bitstream)
-
+setup_hifi_project(${TARGET_NAME} TRUE)
-set(ROOT_DIR ../..)
-set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/modules/")
-
-find_package(Qt5 COMPONENTS Network Script Widgets)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
-setup_hifi_project(${TARGET_NAME} TRUE)
-
-link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
-
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} "${ROOT_DIR}")
-
-IF (WIN32)
-    target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
-ENDIF(WIN32)
-
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)

voxel-edit/CMakeLists.txt

@@ -1,39 +1,7 @@
 set(TARGET_NAME voxel-edit)
 
-set(ROOT_DIR ..)
-set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
-
-# setup for find modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/")
-
-# set up the external glm library
-include(${MACRO_DIR}/IncludeGLM.cmake)
-include_glm(${TARGET_NAME} "${ROOT_DIR}")
-
-find_package(Qt5Script REQUIRED)
-
-include(${MACRO_DIR}/SetupHifiProject.cmake)
 setup_hifi_project(${TARGET_NAME} TRUE)
 
-# link in the shared library
-include(${MACRO_DIR}/LinkHifiLibrary.cmake)
-link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
-
-# link in the hifi octree library
-link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
-
-# link in the hifi voxels library
-link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
-
-# link in the hifi networking library
-link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
-
-IF (WIN32)
-	target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
-ENDIF(WIN32)
-
-target_link_libraries(${TARGET_NAME} Qt5::Script)
-
 # add a definition for ssize_t so that windows doesn't bail
 if (WIN32)
   add_definitions(-Dssize_t=long)