PR feedback and cmake fixes

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()

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) {

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()

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")

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()

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")
 

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()
 

libraries/display-plugins/src/display-plugins/hmd/DebugHmdDisplayPlugin.cpp

@@ -10,7 +10,6 @@
 #include <QtCore/QProcessEnvironment>
 
 #include <ViewFrustum.h>
-#include <controllers/Pose.h>
 #include <gpu/Frame.h>
 
 const QString DebugHmdDisplayPlugin::NAME("HMD Simulator");

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()
 

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()
 

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)

libraries/ktx/CMakeLists.txt

@@ -1,3 +1,3 @@
 set(TARGET_NAME ktx)
 setup_hifi_library()
-link_hifi_libraries()
+include_hifi_library_headers(shared)

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)

libraries/model/src/model/Geometry.h

@@ -13,10 +13,10 @@
 
 #include <glm/glm.hpp>
 
-#include "AABox.h"
+#include <AABox.h>
 
-#include "gpu/Resource.h"
+#include <gpu/Resource.h>
-#include "gpu/Stream.h"
+#include <gpu/Stream.h>
 
 namespace model {
 typedef gpu::BufferView::Index Index;

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()

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()

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()

libraries/render/src/render/Args.h

@@ -71,7 +71,7 @@ namespace render {
         Args() {}
 
         Args(const gpu::ContextPointer& context,
-            QSharedPointer<QObject> renderData = QSharedPointer<OctreeRenderer>(nullptr),
+            QSharedPointer<QObject> renderData = QSharedPointer<QObject>(nullptr),
             float sizeScale = 1.0f,
             int boundaryLevelAdjust = 0,
             RenderMode renderMode = DEFAULT_RENDER_MODE,

libraries/render/src/render/Forward.h

@@ -19,7 +19,6 @@ namespace render {
     class Args;
 }
 
-class OctreeRenderer;
 using RenderArgs = render::Args;
 
 

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()

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)