diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index 69ad1cd815..6e31182f0d 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -12,7 +12,7 @@ link_hifi_libraries(
 )
 
 if (UNIX)
-  list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK ${CMAKE_DL_LIBS})
+  target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
 endif (UNIX)
 
 link_shared_dependencies()
diff --git a/cmake/macros/LinkHifiLibraries.cmake b/cmake/macros/LinkHifiLibraries.cmake
index 464af76553..646b680f27 100644
--- a/cmake/macros/LinkHifiLibraries.cmake
+++ b/cmake/macros/LinkHifiLibraries.cmake
@@ -25,18 +25,9 @@ macro(LINK_HIFI_LIBRARIES)
     # link the actual library - it is static so don't bubble it up
     target_link_libraries(${TARGET_NAME} ${HIFI_LIBRARY})
     
-    # ask the library what its dynamic dependencies are and link them
-    get_target_property(LINKED_TARGET_DEPENDENCY_LIBRARIES ${HIFI_LIBRARY} DEPENDENCY_LIBRARIES)
-    list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK ${LINKED_TARGET_DEPENDENCY_LIBRARIES})
-    
     # ask the library what its include dependencies are and link them
     get_target_property(LINKED_TARGET_DEPENDENCY_INCLUDES ${HIFI_LIBRARY} DEPENDENCY_INCLUDES)
     list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES ${LINKED_TARGET_DEPENDENCY_INCLUDES})
-    
-    # ask the library what its qt module dependencies are and link them
-    get_target_property(LINKED_TARGET_DEPENDENCY_QT_MODULES ${HIFI_LIBRARY} DEPENDENCY_QT_MODULES)
-    list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES ${LINKED_TARGET_DEPENDENCY_QT_MODULES})
-    
   endforeach()
   
 endmacro(LINK_HIFI_LIBRARIES)
\ No newline at end of file
diff --git a/cmake/macros/LinkSharedDependencies.cmake b/cmake/macros/LinkSharedDependencies.cmake
index fd5461c288..9168c5a921 100644
--- a/cmake/macros/LinkSharedDependencies.cmake
+++ b/cmake/macros/LinkSharedDependencies.cmake
@@ -9,14 +9,7 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 
-macro(LINK_SHARED_DEPENDENCIES)  
-  if (${TARGET_NAME}_LIBRARIES_TO_LINK)
-    list(REMOVE_DUPLICATES ${TARGET_NAME}_LIBRARIES_TO_LINK)
-    
-    # link these libraries to our target
-    target_link_libraries(${TARGET_NAME} ${${TARGET_NAME}_LIBRARIES_TO_LINK})
-  endif ()
-  
+macro(LINK_SHARED_DEPENDENCIES)
   if (${TARGET_NAME}_DEPENDENCY_INCLUDES)
     list(REMOVE_DUPLICATES ${TARGET_NAME}_DEPENDENCY_INCLUDES)
     
@@ -24,22 +17,6 @@ macro(LINK_SHARED_DEPENDENCIES)
     include_directories(SYSTEM ${${TARGET_NAME}_DEPENDENCY_INCLUDES})
   endif ()
   
-  if (${TARGET_NAME}_DEPENDENCY_QT_MODULES)
-    list(REMOVE_DUPLICATES ${TARGET_NAME}_DEPENDENCY_QT_MODULES)
-    
-    # find these Qt modules and link them to our own target
-    find_package(Qt5 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} REQUIRED)
-  
-    foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
-      target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
-    endforeach()
-  endif ()
-  
-  # we've already linked our Qt modules, but we need to bubble them up to parents
-  list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${${TARGET_NAME}_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_NAME}_LIBRARIES_TO_LINK}")
   set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_INCLUDES "${${TARGET_NAME}_DEPENDENCY_INCLUDES}")
-  set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_QT_MODULES "${${TARGET_NAME}_DEPENDENCY_QT_MODULES}")
 endmacro(LINK_SHARED_DEPENDENCIES)
\ No newline at end of file
diff --git a/cmake/macros/SetupHifiLibrary.cmake b/cmake/macros/SetupHifiLibrary.cmake
index de9f9b9d1e..362a833862 100644
--- a/cmake/macros/SetupHifiLibrary.cmake
+++ b/cmake/macros/SetupHifiLibrary.cmake
@@ -21,4 +21,11 @@ macro(SETUP_HIFI_LIBRARY)
   set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
   list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
   
+  # find these Qt modules and link them to our own target
+  find_package(Qt5 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} REQUIRED)
+
+  foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
+    target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
+  endforeach()
+  
 endmacro(SETUP_HIFI_LIBRARY)
\ No newline at end of file
diff --git a/cmake/macros/SetupHifiProject.cmake b/cmake/macros/SetupHifiProject.cmake
index 157c22ea79..3f9787faa1 100644
--- a/cmake/macros/SetupHifiProject.cmake
+++ b/cmake/macros/SetupHifiProject.cmake
@@ -27,4 +27,11 @@ macro(SETUP_HIFI_PROJECT)
   
   set(${TARGET_NAME}_DEPENDENCY_QT_MODULES ${ARGN})
   list(APPEND ${TARGET_NAME}_DEPENDENCY_QT_MODULES Core)
+  
+  # find these Qt modules and link them to our own target
+  find_package(Qt5 COMPONENTS ${${TARGET_NAME}_DEPENDENCY_QT_MODULES} REQUIRED)
+
+  foreach(QT_MODULE ${${TARGET_NAME}_DEPENDENCY_QT_MODULES})
+    target_link_libraries(${TARGET_NAME} Qt5::${QT_MODULE})
+  endforeach()
 endmacro()
\ No newline at end of file
diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt
index b804ff27d3..b9f730baaf 100644
--- a/domain-server/CMakeLists.txt
+++ b/domain-server/CMakeLists.txt
@@ -50,6 +50,6 @@ endif ()
 include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 
 # append OpenSSL to our list of libraries to link
-list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${OPENSSL_LIBRARIES}")
+target_link_libraries(${TARGET_NAME} "${OPENSSL_LIBRARIES}")
 
 link_shared_dependencies()
\ No newline at end of file
diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt
index 894fa14c33..2e58645b56 100644
--- a/libraries/fbx/CMakeLists.txt
+++ b/libraries/fbx/CMakeLists.txt
@@ -9,7 +9,7 @@ link_hifi_libraries(shared networking octree voxels)
 
 find_package(ZLIB REQUIRED)
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${ZLIB_LIBRARIES}")
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}")
 
 # call macro to link our dependencies and bubble them up via a property on our target
 link_shared_dependencies()
diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt
index 7c8b628183..90e06bc13e 100644
--- a/libraries/networking/CMakeLists.txt
+++ b/libraries/networking/CMakeLists.txt
@@ -23,7 +23,7 @@ endif ()
 include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 
 # append OpenSSL to our list of libraries to link
-list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${OPENSSL_LIBRARIES}" "${TBB_LIBRARIES}")
+target_link_libraries(${TARGET_NAME} "${OPENSSL_LIBRARIES}" "${TBB_LIBRARIES}")
 
 # append libcuckoo includes to our list of includes to bubble
 list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${TBB_INCLUDE_DIRS}")
diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt
index 9aea2fdea1..f1a30f3724 100644
--- a/libraries/octree/CMakeLists.txt
+++ b/libraries/octree/CMakeLists.txt
@@ -13,7 +13,7 @@ find_package(ZLIB REQUIRED)
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
 
 # append ZLIB and OpenSSL to our list of libraries to link
-list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${ZLIB_LIBRARIES}")
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}")
 
 # call macro to link our dependencies and bubble them up via a property on our target
 link_shared_dependencies()
diff --git a/libraries/voxels/CMakeLists.txt b/libraries/voxels/CMakeLists.txt
index 3214978a2a..874a74ee95 100644
--- a/libraries/voxels/CMakeLists.txt
+++ b/libraries/voxels/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(ZLIB REQUIRED)
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
 
 # add it to our list of libraries to link
-list(APPEND ${TARGET}_LIBRARIES_TO_LINK "${ZLIB_LIBRARIES}")
+target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}")
 
 # call macro to link our dependencies and bubble them up via a property on our target
 link_shared_dependencies()
\ No newline at end of file