rename cmake macro to represent actual purpose

assignment-client/CMakeLists.txt

@@ -15,4 +15,4 @@ if (UNIX)
   target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
 endif (UNIX)
 
-link_shared_dependencies()
+include_dependency_includes()

cmake/macros/IncludeDependencyIncludes.cmake

@@ -1,5 +1,5 @@
 # 
-#  LinkSharedDependencies.cmake
+#  IncludeDependencyIncludes.cmake
 #  cmake/macros
 # 
 #  Copyright 2014 High Fidelity, Inc.
@@ -9,7 +9,7 @@
 #  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 # 
 
-macro(LINK_SHARED_DEPENDENCIES)
+macro(INCLUDE_DEPENDENCY_INCLUDES)
   if (${TARGET_NAME}_DEPENDENCY_INCLUDES)
     list(REMOVE_DUPLICATES ${TARGET_NAME}_DEPENDENCY_INCLUDES)
     
@@ -19,4 +19,4 @@ macro(LINK_SHARED_DEPENDENCIES)
   
   # set the property on this target so it can be retreived by targets linking to us
   set_target_properties(${TARGET_NAME} PROPERTIES DEPENDENCY_INCLUDES "${${TARGET_NAME}_DEPENDENCY_INCLUDES}")
-endmacro(LINK_SHARED_DEPENDENCIES)
+endmacro(INCLUDE_DEPENDENCY_INCLUDES)

domain-server/CMakeLists.txt

@@ -52,4 +52,4 @@ include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}")
 # append OpenSSL to our list of libraries to link
 target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES})
 
-link_shared_dependencies()
+include_dependency_includes()

ice-server/CMakeLists.txt

@@ -6,4 +6,4 @@ setup_hifi_project(Network)
 # link the shared hifi libraries
 link_hifi_libraries(networking shared)
 
-link_shared_dependencies()
+include_dependency_includes()

interface/CMakeLists.txt

@@ -246,4 +246,4 @@ else (APPLE)
 endif (APPLE)
 
 # link any dependencies bubbled up from our linked dependencies
-link_shared_dependencies()
+include_dependency_includes()

libraries/animation/CMakeLists.txt

@@ -5,5 +5,5 @@ setup_hifi_library(Network Script)
 
 link_hifi_libraries(shared fbx)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/audio/CMakeLists.txt

@@ -7,5 +7,5 @@ include_glm()
 
 link_hifi_libraries(networking shared)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/avatars/CMakeLists.txt

@@ -7,5 +7,5 @@ include_glm()
 
 link_hifi_libraries(audio shared octree voxels networking physics fbx)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/embedded-webserver/CMakeLists.txt

@@ -3,5 +3,5 @@ set(TARGET_NAME embedded-webserver)
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Network)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/entities-renderer/CMakeLists.txt

@@ -7,5 +7,5 @@ include_glm()
 
 link_hifi_libraries(shared gpu script-engine render-utils)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/entities/CMakeLists.txt

@@ -7,5 +7,5 @@ include_glm()
 
 link_hifi_libraries(avatars shared octree fbx networking animation physics)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/fbx/CMakeLists.txt

@@ -11,5 +11,5 @@ find_package(ZLIB REQUIRED)
 include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
 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()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/gpu/CMakeLists.txt

@@ -44,5 +44,5 @@ else ()
   list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${OPENGL_INCLUDE_DIR}")
 endif (APPLE)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/metavoxels/CMakeLists.txt

@@ -10,5 +10,5 @@ link_hifi_libraries(shared networking)
 
 include_glm()
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/networking/CMakeLists.txt

@@ -28,5 +28,5 @@ 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}")
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/octree/CMakeLists.txt

@@ -15,5 +15,5 @@ include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
 # append ZLIB and OpenSSL to our list of libraries to link
 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()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/physics/CMakeLists.txt

@@ -15,5 +15,5 @@ link_hifi_libraries(shared)
 ## append BULLET to our list of libraries to link
 #list(APPEND ${TARGET_NAME}_LIBRARIES_TO_LINK "${BULLET_LIBRARIES}")
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/render-utils/CMakeLists.txt

@@ -16,5 +16,5 @@ else ()
   target_link_libraries(${TARGET_NAME} ${GLUT_LIBRARIES})
 endif ()
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/script-engine/CMakeLists.txt

@@ -7,5 +7,5 @@ include_glm()
 
 link_hifi_libraries(shared octree voxels fbx entities animation audio physics metavoxels)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/shared/CMakeLists.txt

@@ -4,5 +4,5 @@ set(TARGET_NAME shared)
 # TODO: there isn't really a good reason to have Script linked here - let's get what is requiring it out (RegisteredMetaTypes.cpp)
 setup_hifi_library(Network Script Widgets)
 
-# call macro to link our dependencies and bubble them up via a property on our target
-link_shared_dependencies()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

libraries/voxels/CMakeLists.txt

@@ -14,5 +14,5 @@ include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
 # add it to our list of libraries to link
 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()
+# call macro to include our dependency includes and bubble them up via a property on our target
+include_dependency_includes()

tests/audio/CMakeLists.txt

@@ -7,4 +7,4 @@ include_glm()
 # link in the shared libraries
 link_hifi_libraries(shared audio networking)
 
-link_shared_dependencies()
+include_dependency_includes()

tests/jitter/CMakeLists.txt

@@ -5,4 +5,4 @@ setup_hifi_project()
 # link in the shared libraries
 link_hifi_libraries(shared networking)
 
-link_shared_dependencies()
+include_dependency_includes()

tests/metavoxels/CMakeLists.txt

@@ -9,4 +9,4 @@ setup_hifi_project(Network Script Widgets)
 # link in the shared libraries
 link_hifi_libraries(metavoxels networking shared)
 
-link_shared_dependencies()
+include_dependency_includes()

tests/networking/CMakeLists.txt

@@ -5,4 +5,4 @@ setup_hifi_project()
 # link in the shared libraries
 link_hifi_libraries(shared networking)
 
-link_shared_dependencies()
+include_dependency_includes()

tests/octree/CMakeLists.txt

@@ -7,4 +7,4 @@ include_glm()
 # link in the shared libraries
 link_hifi_libraries(shared octree voxels fbx metavoxels networking entities avatars audio animation script-engine physics)
 
-link_shared_dependencies()
+include_dependency_includes()

tests/physics/CMakeLists.txt

@@ -7,4 +7,4 @@ include_glm()
 # link in the shared libraries
 link_hifi_libraries(shared physics)
 
-link_shared_dependencies()
+include_dependency_includes()

tests/shared/CMakeLists.txt

@@ -7,4 +7,4 @@ include_glm()
 # link in the shared libraries
 link_hifi_libraries(shared)
 
-link_shared_dependencies()
+include_dependency_includes()

tools/bitstream2json/CMakeLists.txt

@@ -5,4 +5,4 @@ include_glm()
 
 link_hifi_libraries(metavoxels)
 
-link_shared_dependencies()
+include_dependency_includes()

tools/json2bitstream/CMakeLists.txt

@@ -5,4 +5,4 @@ include_glm()
 
 link_hifi_libraries(metavoxels)
 
-link_shared_dependencies()
+include_dependency_includes()

tools/mtc/CMakeLists.txt

@@ -1,4 +1,4 @@
 set(TARGET_NAME mtc)
 setup_hifi_project()
 
-link_shared_dependencies()
+include_dependency_includes()