diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt index e149a8549e..41343f52d0 100644 --- a/assignment-client/CMakeLists.txt +++ b/assignment-client/CMakeLists.txt @@ -17,6 +17,4 @@ if (UNIX) target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS}) endif (UNIX) -include_dependency_includes() - copy_dlls_beside_windows_executable() diff --git a/cmake/macros/IncludeDependencyIncludes.cmake b/cmake/macros/IncludeDependencyIncludes.cmake deleted file mode 100644 index 4474bdc53a..0000000000 --- a/cmake/macros/IncludeDependencyIncludes.cmake +++ /dev/null @@ -1,22 +0,0 @@ -# -# IncludeDependencyIncludes.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(INCLUDE_DEPENDENCY_INCLUDES) - if (${TARGET_NAME}_DEPENDENCY_INCLUDES) - list(REMOVE_DUPLICATES ${TARGET_NAME}_DEPENDENCY_INCLUDES) - - # include those in our own target - include_directories(SYSTEM ${${TARGET_NAME}_DEPENDENCY_INCLUDES}) - - # 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}") - endif() -endmacro(INCLUDE_DEPENDENCY_INCLUDES) \ No newline at end of file diff --git a/domain-server/CMakeLists.txt b/domain-server/CMakeLists.txt index 17d2c9185b..4ff3c1cce1 100644 --- a/domain-server/CMakeLists.txt +++ b/domain-server/CMakeLists.txt @@ -52,6 +52,4 @@ include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") # append OpenSSL to our list of libraries to link target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES}) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt index 20d35fb204..a986fcae0d 100644 --- a/gvr-interface/CMakeLists.txt +++ b/gvr-interface/CMakeLists.txt @@ -29,7 +29,6 @@ find_package(GLM REQUIRED) target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS}) link_hifi_libraries(shared networking audio-client avatars) -include_dependency_includes() if (ANDROID) find_package(LibOVR) diff --git a/ice-server/CMakeLists.txt b/ice-server/CMakeLists.txt index 7224bdc31a..13d89fc4a2 100644 --- a/ice-server/CMakeLists.txt +++ b/ice-server/CMakeLists.txt @@ -6,6 +6,4 @@ setup_hifi_project(Network) # link the shared hifi libraries link_hifi_libraries(embedded-webserver networking shared) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 31d8f3df45..7458a6c784 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -240,6 +240,3 @@ else (APPLE) endif (APPLE) copy_dlls_beside_windows_executable() - -# link any dependencies bubbled up from our linked dependencies -include_dependency_includes() diff --git a/libraries/animation/CMakeLists.txt b/libraries/animation/CMakeLists.txt index 4024205f81..8c75d5620c 100644 --- a/libraries/animation/CMakeLists.txt +++ b/libraries/animation/CMakeLists.txt @@ -3,7 +3,4 @@ set(TARGET_NAME animation) # use setup_hifi_library macro to setup our project and link appropriate Qt modules setup_hifi_library(Network Script) -link_hifi_libraries(shared gpu model fbx) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +link_hifi_libraries(shared gpu model fbx) \ No newline at end of file diff --git a/libraries/audio-client/CMakeLists.txt b/libraries/audio-client/CMakeLists.txt index 7067e2ed81..fa7249bee5 100644 --- a/libraries/audio-client/CMakeLists.txt +++ b/libraries/audio-client/CMakeLists.txt @@ -6,7 +6,7 @@ setup_hifi_library(Network Multimedia) link_hifi_libraries(audio) # append audio includes to our list of includes to bubble -list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${HIFI_LIBRARY_DIR}/audio/src") +target_include_directories(${TARGET_NAME} PUBLIC "${HIFI_LIBRARY_DIR}/audio/src") # have CMake grab externals for us add_dependency_external_projects(gverb soxr) @@ -25,7 +25,4 @@ if (APPLE) find_library(CoreAudio CoreAudio) find_library(CoreFoundation CoreFoundation) target_link_libraries(${TARGET_NAME} ${CoreAudio} ${CoreFoundation}) -endif () - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +endif () \ No newline at end of file diff --git a/libraries/audio/CMakeLists.txt b/libraries/audio/CMakeLists.txt index b9dfc06cad..c2d5c8aca9 100644 --- a/libraries/audio/CMakeLists.txt +++ b/libraries/audio/CMakeLists.txt @@ -7,7 +7,4 @@ add_dependency_external_projects(glm) find_package(GLM REQUIRED) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) -link_hifi_libraries(networking shared) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +link_hifi_libraries(networking shared) \ No newline at end of file diff --git a/libraries/avatars/CMakeLists.txt b/libraries/avatars/CMakeLists.txt index ad06b4adfa..acc939b25c 100644 --- a/libraries/avatars/CMakeLists.txt +++ b/libraries/avatars/CMakeLists.txt @@ -8,6 +8,3 @@ find_package(GLM REQUIRED) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) link_hifi_libraries(audio shared networking) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() diff --git a/libraries/embedded-webserver/CMakeLists.txt b/libraries/embedded-webserver/CMakeLists.txt index ef2cf1054c..955487e540 100644 --- a/libraries/embedded-webserver/CMakeLists.txt +++ b/libraries/embedded-webserver/CMakeLists.txt @@ -1,7 +1,4 @@ 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 include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +setup_hifi_library(Network) \ No newline at end of file diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt index b807428203..c0880ed15d 100644 --- a/libraries/entities-renderer/CMakeLists.txt +++ b/libraries/entities-renderer/CMakeLists.txt @@ -7,7 +7,4 @@ add_dependency_external_projects(glm) find_package(GLM REQUIRED) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) -link_hifi_libraries(shared gpu script-engine render-utils) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() +link_hifi_libraries(shared gpu script-engine render-utils) \ No newline at end of file diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt index 5317f97b85..156f3d1f09 100644 --- a/libraries/entities/CMakeLists.txt +++ b/libraries/entities/CMakeLists.txt @@ -10,6 +10,3 @@ target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) include_bullet() link_hifi_libraries(avatars shared octree gpu model fbx networking animation) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() diff --git a/libraries/environment/CMakeLists.txt b/libraries/environment/CMakeLists.txt index 1c4daa1a6f..61a8c6b8df 100644 --- a/libraries/environment/CMakeLists.txt +++ b/libraries/environment/CMakeLists.txt @@ -14,7 +14,4 @@ find_package(ZLIB REQUIRED) 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 include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES}) \ No newline at end of file diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt index b43e88bb3d..c1ba5a1c2a 100644 --- a/libraries/fbx/CMakeLists.txt +++ b/libraries/fbx/CMakeLists.txt @@ -11,7 +11,4 @@ link_hifi_libraries(shared gpu model networking octree) find_package(ZLIB REQUIRED) include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}") -target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES}) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() +target_link_libraries(${TARGET_NAME} ${ZLIB_LIBRARIES}) \ No newline at end of file diff --git a/libraries/gpu/CMakeLists.txt b/libraries/gpu/CMakeLists.txt index 789ffdbfeb..6e7a38f594 100644 --- a/libraries/gpu/CMakeLists.txt +++ b/libraries/gpu/CMakeLists.txt @@ -19,8 +19,7 @@ elseif (WIN32) target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} opengl32.lib) - # need to bubble up the GLEW_INCLUDE_DIRS - list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${GLEW_INCLUDE_DIRS}") + target_include_directories(${TARGET_NAME} PUBLIC ${GLEW_INCLUDE_DIRS}) # try to find the Nsight package and add it to the build if we find it find_package(NSIGHT) @@ -40,9 +39,5 @@ else () target_link_libraries(${TARGET_NAME} "${OPENGL_LIBRARY}") - # need to bubble up the OPENGL_INCLUDE_DIR - list(APPEND ${TARGET_NAME}_DEPENDENCY_INCLUDES "${OPENGL_INCLUDE_DIR}") + target_include_directories(${TARGET_NAME} PUBLIC ${OPENGL_INCLUDE_DIR}) endif (APPLE) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() diff --git a/libraries/metavoxels/CMakeLists.txt b/libraries/metavoxels/CMakeLists.txt index f748971311..240a2d8853 100644 --- a/libraries/metavoxels/CMakeLists.txt +++ b/libraries/metavoxels/CMakeLists.txt @@ -10,7 +10,4 @@ link_hifi_libraries(shared networking) add_dependency_external_projects(glm) find_package(GLM REQUIRED) -target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) \ No newline at end of file diff --git a/libraries/model/CMakeLists.txt b/libraries/model/CMakeLists.txt index e3eeae7137..c62b29599f 100755 --- a/libraries/model/CMakeLists.txt +++ b/libraries/model/CMakeLists.txt @@ -7,7 +7,4 @@ add_dependency_external_projects(glm) find_package(GLM REQUIRED) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) -link_hifi_libraries(shared gpu) - -# call macro to link our dependencies and bubble them up via a property on our target -include_dependency_includes() +link_hifi_libraries(shared gpu) \ No newline at end of file diff --git a/libraries/networking/CMakeLists.txt b/libraries/networking/CMakeLists.txt index f7dea6c10f..6b386ace92 100644 --- a/libraries/networking/CMakeLists.txt +++ b/libraries/networking/CMakeLists.txt @@ -28,7 +28,4 @@ include_directories(SYSTEM "${OPENSSL_INCLUDE_DIR}") target_link_libraries(${TARGET_NAME} ${OPENSSL_LIBRARIES} ${TBB_LIBRARIES}) # append tbb includes to our list of includes to bubble -target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS}) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +target_include_directories(${TARGET_NAME} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS}) \ No newline at end of file diff --git a/libraries/octree/CMakeLists.txt b/libraries/octree/CMakeLists.txt index ad6f32f0ff..1f44795148 100644 --- a/libraries/octree/CMakeLists.txt +++ b/libraries/octree/CMakeLists.txt @@ -16,6 +16,3 @@ 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 include our dependency includes and bubble them up via a property on our target -include_dependency_includes() diff --git a/libraries/physics/CMakeLists.txt b/libraries/physics/CMakeLists.txt index 775d5fcb0f..c3dfcafa48 100644 --- a/libraries/physics/CMakeLists.txt +++ b/libraries/physics/CMakeLists.txt @@ -14,6 +14,3 @@ endif (BULLET_FOUND) link_hifi_libraries(shared fbx entities) include_hifi_library_headers(fbx) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt index d6e419fa49..b266c001e4 100644 --- a/libraries/render-utils/CMakeLists.txt +++ b/libraries/render-utils/CMakeLists.txt @@ -1,23 +1,20 @@ -set(TARGET_NAME render-utils) - -AUTOSCRIBE_SHADER_LIB() - -# pull in the resources.qrc file -qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc") - -# use setup_hifi_library macro to setup our project and link appropriate Qt modules -setup_hifi_library(Widgets OpenGL Network Script) - -add_dependency_external_projects(glm) +set(TARGET_NAME render-utils) + +AUTOSCRIBE_SHADER_LIB() + +# pull in the resources.qrc file +qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc") + +# use setup_hifi_library macro to setup our project and link appropriate Qt modules +setup_hifi_library(Widgets OpenGL Network Script) + +add_dependency_external_projects(glm) find_package(GLM REQUIRED) -target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) - -link_hifi_libraries(animation fbx shared gpu) - -if (WIN32) - # we're using static GLEW, so define GLEW_STATIC - add_definitions(-DGLEW_STATIC) -endif () - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() +target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) + +link_hifi_libraries(animation fbx shared gpu) + +if (WIN32) + # we're using static GLEW, so define GLEW_STATIC + add_definitions(-DGLEW_STATIC) +endif () diff --git a/libraries/script-engine/CMakeLists.txt b/libraries/script-engine/CMakeLists.txt index 99ac9da87c..013f43530c 100644 --- a/libraries/script-engine/CMakeLists.txt +++ b/libraries/script-engine/CMakeLists.txt @@ -8,7 +8,3 @@ find_package(GLM REQUIRED) target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) link_hifi_libraries(shared octree gpu model fbx entities animation audio physics metavoxels) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() - diff --git a/libraries/shared/CMakeLists.txt b/libraries/shared/CMakeLists.txt index ab4b853b6d..9785994a29 100644 --- a/libraries/shared/CMakeLists.txt +++ b/libraries/shared/CMakeLists.txt @@ -6,7 +6,4 @@ setup_hifi_library(Gui Network Script Widgets) add_dependency_external_projects(glm) find_package(GLM REQUIRED) -target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) - -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() \ No newline at end of file +target_include_directories(${TARGET_NAME} PUBLIC ${GLM_INCLUDE_DIRS}) \ No newline at end of file diff --git a/tests/audio/CMakeLists.txt b/tests/audio/CMakeLists.txt index a499ecaf1a..a106fc9ea9 100644 --- a/tests/audio/CMakeLists.txt +++ b/tests/audio/CMakeLists.txt @@ -5,6 +5,4 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared audio networking) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/jitter/CMakeLists.txt b/tests/jitter/CMakeLists.txt index 8cfee4b9ad..377dcc1081 100644 --- a/tests/jitter/CMakeLists.txt +++ b/tests/jitter/CMakeLists.txt @@ -5,6 +5,4 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared networking) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/metavoxels/CMakeLists.txt b/tests/metavoxels/CMakeLists.txt index 1c3cb88328..e6a62dc55c 100644 --- a/tests/metavoxels/CMakeLists.txt +++ b/tests/metavoxels/CMakeLists.txt @@ -7,6 +7,4 @@ setup_hifi_project(Network Script Widgets) # link in the shared libraries link_hifi_libraries(metavoxels networking shared) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/networking/CMakeLists.txt b/tests/networking/CMakeLists.txt index 0e15965966..6b9d3738d4 100644 --- a/tests/networking/CMakeLists.txt +++ b/tests/networking/CMakeLists.txt @@ -5,6 +5,4 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared networking) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 7542e40f87..70457e220a 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -5,6 +5,4 @@ setup_hifi_project(Script Network) # link in the shared libraries link_hifi_libraries(shared octree gpu model fbx metavoxels networking entities avatars audio animation script-engine physics) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/physics/CMakeLists.txt b/tests/physics/CMakeLists.txt index c4107b9bfc..12cd9b8531 100644 --- a/tests/physics/CMakeLists.txt +++ b/tests/physics/CMakeLists.txt @@ -10,6 +10,4 @@ include_bullet() link_hifi_libraries(shared physics) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/render-utils/CMakeLists.txt b/tests/render-utils/CMakeLists.txt index 3745f904df..d55d3c542b 100644 --- a/tests/render-utils/CMakeLists.txt +++ b/tests/render-utils/CMakeLists.txt @@ -12,7 +12,4 @@ if (WIN32) add_definitions(-DGLEW_STATIC) endif () -#link_libraries(animation fbx shared gpu) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tests/shared/CMakeLists.txt b/tests/shared/CMakeLists.txt index 8f8d6c425b..9ae00756e8 100644 --- a/tests/shared/CMakeLists.txt +++ b/tests/shared/CMakeLists.txt @@ -5,6 +5,4 @@ setup_hifi_project() # link in the shared libraries link_hifi_libraries(shared) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tools/bitstream2json/CMakeLists.txt b/tools/bitstream2json/CMakeLists.txt index b7b2eb198c..32a5a639ab 100644 --- a/tools/bitstream2json/CMakeLists.txt +++ b/tools/bitstream2json/CMakeLists.txt @@ -3,6 +3,4 @@ setup_hifi_project(Widgets Script) link_hifi_libraries(metavoxels) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tools/json2bitstream/CMakeLists.txt b/tools/json2bitstream/CMakeLists.txt index a258fbf263..abda40667c 100644 --- a/tools/json2bitstream/CMakeLists.txt +++ b/tools/json2bitstream/CMakeLists.txt @@ -3,6 +3,4 @@ setup_hifi_project(Widgets Script) link_hifi_libraries(metavoxels) -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tools/mtc/CMakeLists.txt b/tools/mtc/CMakeLists.txt index ea21eaf5fc..5c598eaf0b 100644 --- a/tools/mtc/CMakeLists.txt +++ b/tools/mtc/CMakeLists.txt @@ -1,6 +1,4 @@ set(TARGET_NAME mtc) setup_hifi_project() -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file diff --git a/tools/scribe/CMakeLists.txt b/tools/scribe/CMakeLists.txt index 3464809b38..bc07fec230 100755 --- a/tools/scribe/CMakeLists.txt +++ b/tools/scribe/CMakeLists.txt @@ -1,7 +1,4 @@ set(TARGET_NAME scribe) setup_hifi_project() -# call macro to include our dependency includes and bubble them up via a property on our target -include_dependency_includes() - copy_dlls_beside_windows_executable() \ No newline at end of file