From a69cf31f4bb6aedd4878ce4bfd1b8d0d851eb778 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Fri, 16 Jun 2017 02:14:44 -0700 Subject: [PATCH] PR feedback and cmake fixes --- cmake/macros/LinkHifiLibraries.cmake | 10 ++++++---- interface/src/Application.cpp | 3 --- libraries/animation/CMakeLists.txt | 2 ++ libraries/audio-client/CMakeLists.txt | 2 ++ libraries/avatars-renderer/CMakeLists.txt | 12 ++++++++++++ libraries/controllers/CMakeLists.txt | 1 + libraries/display-plugins/CMakeLists.txt | 8 ++++++++ .../display-plugins/hmd/DebugHmdDisplayPlugin.cpp | 1 - libraries/entities-renderer/CMakeLists.txt | 10 ++++++++++ libraries/entities/CMakeLists.txt | 2 ++ libraries/fbx/CMakeLists.txt | 1 + libraries/ktx/CMakeLists.txt | 2 +- libraries/model-networking/CMakeLists.txt | 2 +- libraries/model/src/model/Geometry.h | 6 +++--- libraries/physics/CMakeLists.txt | 6 ++++++ libraries/render-utils/CMakeLists.txt | 3 +++ libraries/render/CMakeLists.txt | 3 ++- libraries/render/src/render/Args.h | 2 +- libraries/render/src/render/Forward.h | 1 - libraries/trackers/CMakeLists.txt | 1 + libraries/ui-plugins/CMakeLists.txt | 1 + 21 files changed, 63 insertions(+), 16 deletions(-) diff --git a/cmake/macros/LinkHifiLibraries.cmake b/cmake/macros/LinkHifiLibraries.cmake index de4ff23863..395af01f8d 100644 --- a/cmake/macros/LinkHifiLibraries.cmake +++ b/cmake/macros/LinkHifiLibraries.cmake @@ -7,16 +7,18 @@ # See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html # -macro(LINK_HIFI_LIBRARIES) +function(LINK_HIFI_LIBRARIES) file(RELATIVE_PATH RELATIVE_LIBRARY_DIR_PATH ${CMAKE_CURRENT_SOURCE_DIR} "${HIFI_LIBRARY_DIR}") set(LIBRARIES_TO_LINK ${ARGN}) - - foreach(HIFI_LIBRARY ${LIBRARIES_TO_LINK}) + foreach(HIFI_LIBRARY ${LIBRARIES_TO_LINK}) if (NOT TARGET ${HIFI_LIBRARY}) add_subdirectory("${RELATIVE_LIBRARY_DIR_PATH}/${HIFI_LIBRARY}" "${RELATIVE_LIBRARY_DIR_PATH}/${HIFI_LIBRARY}") endif () + endforeach() + + foreach(HIFI_LIBRARY ${LIBRARIES_TO_LINK}) include_directories("${HIFI_LIBRARY_DIR}/${HIFI_LIBRARY}/src") include_directories("${CMAKE_BINARY_DIR}/libraries/${HIFI_LIBRARY}/shaders") @@ -29,4 +31,4 @@ macro(LINK_HIFI_LIBRARIES) setup_memory_debugger() -endmacro(LINK_HIFI_LIBRARIES) +endfunction() diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 74659c3f52..655a1e6251 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5071,7 +5071,6 @@ namespace render { void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool selfAvatarOnly) { -#if 1 // FIXME: This preDisplayRender call is temporary until we create a separate render::scene for the mirror rendering. // Then we can move this logic into the Avatar::simulate call. auto myAvatar = getMyAvatar(); @@ -5149,8 +5148,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se // Before the deferred pass, let's try to use the render engine _renderEngine->run(); } -#endif - } void Application::resetSensors(bool andReload) { diff --git a/libraries/animation/CMakeLists.txt b/libraries/animation/CMakeLists.txt index cc2f3858a3..b9fef19fbb 100644 --- a/libraries/animation/CMakeLists.txt +++ b/libraries/animation/CMakeLists.txt @@ -1,5 +1,7 @@ set(TARGET_NAME animation) setup_hifi_library(Network Script) link_hifi_libraries(shared model fbx) +include_hifi_library_headers(networking) +include_hifi_library_headers(gpu) target_nsight() diff --git a/libraries/audio-client/CMakeLists.txt b/libraries/audio-client/CMakeLists.txt index 9c298ce664..d419a2fb7a 100644 --- a/libraries/audio-client/CMakeLists.txt +++ b/libraries/audio-client/CMakeLists.txt @@ -1,6 +1,8 @@ set(TARGET_NAME audio-client) setup_hifi_library(Network Multimedia) link_hifi_libraries(audio plugins) +include_hifi_library_headers(shared) +include_hifi_library_headers(networking) # append audio includes to our list of includes to bubble target_include_directories(${TARGET_NAME} PUBLIC "${HIFI_LIBRARY_DIR}/audio/src") diff --git a/libraries/avatars-renderer/CMakeLists.txt b/libraries/avatars-renderer/CMakeLists.txt index 2ac5e6766d..bfbeab086d 100644 --- a/libraries/avatars-renderer/CMakeLists.txt +++ b/libraries/avatars-renderer/CMakeLists.txt @@ -2,5 +2,17 @@ set(TARGET_NAME avatars-renderer) AUTOSCRIBE_SHADER_LIB(gpu model render render-utils) setup_hifi_library(Widgets Network Script) link_hifi_libraries(shared gpu model animation model-networking script-engine render image render-utils) +include_hifi_library_headers(avatars) +include_hifi_library_headers(networking) +include_hifi_library_headers(fbx) +include_hifi_library_headers(recording) +include_hifi_library_headers(trackers) +include_hifi_library_headers(ktx) +include_hifi_library_headers(procedural) +include_hifi_library_headers(physics) +include_hifi_library_headers(entities-renderer) +include_hifi_library_headers(audio) +include_hifi_library_headers(entities) +include_hifi_library_headers(octree) target_bullet() diff --git a/libraries/controllers/CMakeLists.txt b/libraries/controllers/CMakeLists.txt index bf226f2647..6b1ab72c60 100644 --- a/libraries/controllers/CMakeLists.txt +++ b/libraries/controllers/CMakeLists.txt @@ -5,6 +5,7 @@ setup_hifi_library(Script Qml) # use setup_hifi_library macro to setup our project and link appropriate Qt modules link_hifi_libraries(shared) +include_hifi_library_headers(networking) GroupSources("src/controllers") diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt index b7542c1d86..83a1c635ca 100644 --- a/libraries/display-plugins/CMakeLists.txt +++ b/libraries/display-plugins/CMakeLists.txt @@ -2,6 +2,14 @@ set(TARGET_NAME display-plugins) AUTOSCRIBE_SHADER_LIB(gpu display-plugins) setup_hifi_library(OpenGL) link_hifi_libraries(shared plugins ui-plugins gl gpu-gl ui render-utils) +include_hifi_library_headers(gpu) +include_hifi_library_headers(model-networking) +include_hifi_library_headers(networking) +include_hifi_library_headers(model) +include_hifi_library_headers(fbx) +include_hifi_library_headers(image) +include_hifi_library_headers(ktx) +include_hifi_library_headers(render) target_opengl() diff --git a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp index 5a3e5afc86..fd45398236 100644 --- a/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp +++ b/libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp @@ -10,7 +10,6 @@ #include #include -#include #include const QString DebugHmdDisplayPlugin::NAME("HMD Simulator"); diff --git a/libraries/entities-renderer/CMakeLists.txt b/libraries/entities-renderer/CMakeLists.txt index 8ef28bbc7b..3df33b6a5d 100644 --- a/libraries/entities-renderer/CMakeLists.txt +++ b/libraries/entities-renderer/CMakeLists.txt @@ -2,6 +2,16 @@ set(TARGET_NAME entities-renderer) AUTOSCRIBE_SHADER_LIB(gpu model procedural render render-utils) setup_hifi_library(Widgets Network Script) link_hifi_libraries(shared gpu procedural model model-networking script-engine render render-utils image) +include_hifi_library_headers(networking) +include_hifi_library_headers(gl) +include_hifi_library_headers(ktx) +include_hifi_library_headers(octree) +include_hifi_library_headers(audio) +include_hifi_library_headers(physics) +include_hifi_library_headers(animation) +include_hifi_library_headers(fbx) +include_hifi_library_headers(entities) +include_hifi_library_headers(avatars) target_bullet() diff --git a/libraries/entities/CMakeLists.txt b/libraries/entities/CMakeLists.txt index b2ae0f0ab7..ddb5fbaf73 100644 --- a/libraries/entities/CMakeLists.txt +++ b/libraries/entities/CMakeLists.txt @@ -1,6 +1,8 @@ set(TARGET_NAME entities) setup_hifi_library(Network Script) link_hifi_libraries(avatars shared audio octree model model-networking fbx networking animation) +include_hifi_library_headers(networking) +include_hifi_library_headers(gpu) target_bullet() diff --git a/libraries/fbx/CMakeLists.txt b/libraries/fbx/CMakeLists.txt index d9f4aaf03e..d9c073f213 100644 --- a/libraries/fbx/CMakeLists.txt +++ b/libraries/fbx/CMakeLists.txt @@ -1,3 +1,4 @@ set(TARGET_NAME fbx) setup_hifi_library() link_hifi_libraries(shared model networking) +include_hifi_library_headers(gpu) diff --git a/libraries/ktx/CMakeLists.txt b/libraries/ktx/CMakeLists.txt index 404660b247..967ea71eb6 100644 --- a/libraries/ktx/CMakeLists.txt +++ b/libraries/ktx/CMakeLists.txt @@ -1,3 +1,3 @@ set(TARGET_NAME ktx) setup_hifi_library() -link_hifi_libraries() \ No newline at end of file +include_hifi_library_headers(shared) \ No newline at end of file diff --git a/libraries/model-networking/CMakeLists.txt b/libraries/model-networking/CMakeLists.txt index f7175bc533..db5563d7ea 100644 --- a/libraries/model-networking/CMakeLists.txt +++ b/libraries/model-networking/CMakeLists.txt @@ -1,4 +1,4 @@ set(TARGET_NAME model-networking) setup_hifi_library() link_hifi_libraries(shared networking model fbx ktx image) - +include_hifi_library_headers(gpu) diff --git a/libraries/model/src/model/Geometry.h b/libraries/model/src/model/Geometry.h index 2375944f04..a3198eed26 100755 --- a/libraries/model/src/model/Geometry.h +++ b/libraries/model/src/model/Geometry.h @@ -13,10 +13,10 @@ #include -#include "AABox.h" +#include -#include "gpu/Resource.h" -#include "gpu/Stream.h" +#include +#include namespace model { typedef gpu::BufferView::Index Index; diff --git a/libraries/physics/CMakeLists.txt b/libraries/physics/CMakeLists.txt index 7733c019e0..e219d3dbcd 100644 --- a/libraries/physics/CMakeLists.txt +++ b/libraries/physics/CMakeLists.txt @@ -1,5 +1,11 @@ set(TARGET_NAME physics) setup_hifi_library() link_hifi_libraries(shared fbx entities model) +include_hifi_library_headers(networking) +include_hifi_library_headers(gpu) +include_hifi_library_headers(avatars) +include_hifi_library_headers(audio) +include_hifi_library_headers(octree) +include_hifi_library_headers(animation) target_bullet() diff --git a/libraries/render-utils/CMakeLists.txt b/libraries/render-utils/CMakeLists.txt index c359924e0d..0079ffae66 100644 --- a/libraries/render-utils/CMakeLists.txt +++ b/libraries/render-utils/CMakeLists.txt @@ -4,6 +4,9 @@ AUTOSCRIBE_SHADER_LIB(gpu model render) qt5_add_resources(QT_RESOURCES_FILE "${CMAKE_CURRENT_SOURCE_DIR}/res/fonts/fonts.qrc") setup_hifi_library(Widgets OpenGL Network Qml Quick Script) link_hifi_libraries(shared ktx gpu model model-networking render animation fbx entities image procedural) +include_hifi_library_headers(networking) +include_hifi_library_headers(octree) +include_hifi_library_headers(audio) if (NOT ANDROID) target_nsight() diff --git a/libraries/render/CMakeLists.txt b/libraries/render/CMakeLists.txt index a3faba9ef3..561dff4290 100644 --- a/libraries/render/CMakeLists.txt +++ b/libraries/render/CMakeLists.txt @@ -2,7 +2,8 @@ set(TARGET_NAME render) AUTOSCRIBE_SHADER_LIB(gpu model) setup_hifi_library() +link_hifi_libraries(shared ktx gpu model) # render needs octree only for getAccuracyAngle(float, int) -link_hifi_libraries(shared networking ktx gpu model octree) +include_hifi_library_headers(octree) target_nsight() diff --git a/libraries/render/src/render/Args.h b/libraries/render/src/render/Args.h index 1b9a8c54db..901e0db22f 100644 --- a/libraries/render/src/render/Args.h +++ b/libraries/render/src/render/Args.h @@ -71,7 +71,7 @@ namespace render { Args() {} Args(const gpu::ContextPointer& context, - QSharedPointer renderData = QSharedPointer(nullptr), + QSharedPointer renderData = QSharedPointer(nullptr), float sizeScale = 1.0f, int boundaryLevelAdjust = 0, RenderMode renderMode = DEFAULT_RENDER_MODE, diff --git a/libraries/render/src/render/Forward.h b/libraries/render/src/render/Forward.h index b1cf68f226..4aba074d1e 100644 --- a/libraries/render/src/render/Forward.h +++ b/libraries/render/src/render/Forward.h @@ -19,7 +19,6 @@ namespace render { class Args; } -class OctreeRenderer; using RenderArgs = render::Args; diff --git a/libraries/trackers/CMakeLists.txt b/libraries/trackers/CMakeLists.txt index 0999a45b59..6943f1a197 100644 --- a/libraries/trackers/CMakeLists.txt +++ b/libraries/trackers/CMakeLists.txt @@ -2,5 +2,6 @@ set(TARGET_NAME trackers) setup_hifi_library() GroupSources("src") link_hifi_libraries(shared) +include_hifi_library_headers(octree) target_bullet() diff --git a/libraries/ui-plugins/CMakeLists.txt b/libraries/ui-plugins/CMakeLists.txt index 9ce189b117..8da0815082 100644 --- a/libraries/ui-plugins/CMakeLists.txt +++ b/libraries/ui-plugins/CMakeLists.txt @@ -1,3 +1,4 @@ set(TARGET_NAME ui-plugins) setup_hifi_library(OpenGL) link_hifi_libraries(shared plugins ui) +include_hifi_library_headers(gpu) \ No newline at end of file