repairs for interface build to succeed

assignment-client/CMakeLists.txt

@@ -9,6 +9,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake
 include("${MACRO_DIR}/SetupHifiProject.cmake")
 setup_hifi_project(${TARGET_NAME} TRUE)
 
+include(${MACRO_DIR}/IncludeGLM.cmake)
+include_glm(${TARGET_NAME} "${ROOT_DIR}")
+
 # link in the shared libraries
 include(${MACRO_DIR}/LinkHifiLibrary.cmake)
 link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")

assignment-client/src/avatars/ScriptableAvatar.cpp

@@ -11,6 +11,8 @@
 
 #include <QThread>
 
+#include <GLMHelpers.h>
+
 #include "ScriptableAvatar.h"
 
 ScriptableAvatar::ScriptableAvatar(ScriptEngine* scriptEngine) : _scriptEngine(scriptEngine), _animation(NULL) {

cmake/macros/IncludeHifiLibraryHeaders.cmake

@@ -0,0 +1,16 @@
+# 
+#  IncludeHifiLibraryHeaders.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_hifi_library_headers LIBRARY ROOT_DIR)
+  
+  include_directories("${ROOT_DIR}/libraries/${LIBRARY}/src")
+  
+endmacro(include_hifi_library_headers _library _root_dir)

cmake/macros/SetupHifiProject.cmake

@@ -26,9 +26,7 @@ macro(SETUP_HIFI_PROJECT TARGET INCLUDE_QT)
   add_executable(${TARGET} ${TARGET_SRCS} ${ARGN})
   
   if (${INCLUDE_QT})
-    find_package(Qt5Core REQUIRED)
-    qt5_use_modules(${TARGET} Core)
+    find_package(Qt5 COMPONENTS Core)
+    target_link_libraries(${TARGET} Qt5::Core)
   endif ()
-  
-  target_link_libraries(${TARGET} ${QT_LIBRARIES})
 endmacro()

cmake/modules/FindLibOVR.cmake

@@ -29,6 +29,8 @@ include(SelectLibraryConfigurations)
 if (APPLE)
   find_library(LIBOVR_LIBRARY_DEBUG NAMES ovr PATH_SUFFIXES Lib/MacOS/Debug HINTS ${OCULUS_SEARCH_DIRS})
   find_library(LIBOVR_LIBRARY_RELEASE NAMES ovr PATH_SUFFIXES Lib/MacOS/Release HINTS ${OCULUS_SEARCH_DIRS})
+  find_library(ApplicationServices ApplicationServices)
+  find_library(IOKit IOKit)
 elseif (UNIX)
   find_library(UDEV_LIBRARY_RELEASE udev /usr/lib/x86_64-linux-gnu/)
   find_library(XINERAMA_LIBRARY_RELEASE Xinerama /usr/lib/x86_64-linux-gnu/)
@@ -53,12 +55,16 @@ endif ()
 select_library_configurations(LIBOVR)
 set(LIBOVR_LIBRARIES "${LIBOVR_LIBRARY}")
 
-if (UNIX AND NOT APPLE) 
+if (APPLE)
+  set(LIBOVR_LIBRARIES "${LIBOVR_LIBRARIES}" ${IOKit} ${ApplicationServices})
+elseif (UNIX) 
   set(LIBOVR_LIBRARIES "${LIBOVR_LIBRARIES}" "${UDEV_LIBRARY}" "${XINERAMA_LIBRARY}")
 endif ()
 
 include(FindPackageHandleStandardArgs)
-if (UNIX AND NOT APPLE)
+if (APPLE)
+  find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_SRC_DIR LIBOVR_LIBRARIES IOKit ApplicationServices)
+elseif (UNIX)
   find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_SRC_DIR LIBOVR_LIBRARIES UDEV_LIBRARY XINERAMA_LIBRARY)
 else ()
   find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_SRC_DIR LIBOVR_LIBRARIES)

domain-server/CMakeLists.txt

@@ -7,7 +7,6 @@ set(MACRO_DIR "${ROOT_DIR}/cmake/macros")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../cmake/modules/")
 
 include(${MACRO_DIR}/SetupHifiProject.cmake)
-
 setup_hifi_project(${TARGET_NAME} TRUE)
 
 # remove and then copy the files for the webserver
@@ -34,5 +33,5 @@ if (WIN32)
   add_definitions(-Dssize_t=long)
 endif ()
 
-find_package(Qt5 COMPONENTS Network)
+find_package(Qt5 COMPONENTS Network Widgets)
 target_link_libraries(${TARGET_NAME} Qt5::Network)

interface/CMakeLists.txt

@@ -52,7 +52,7 @@ foreach(SUBDIR avatar devices renderer ui starfield location scripting voxels pa
   set(INTERFACE_SRCS ${INTERFACE_SRCS} "${SUBDIR_SRCS}")
 endforeach(SUBDIR)
 
-# find_package(Qt5 COMPONENTS Core Gui Multimedia Network OpenGL Script Svg WebKit WebKitWidgets Xml UiTools)
+find_package(Qt5 COMPONENTS Gui Multimedia Network OpenGL Script Svg WebKitWidgets)
 
 # grab the ui files in resources/ui
 file (GLOB_RECURSE QT_UI_FILES ui/*.ui)
@@ -180,8 +180,8 @@ endif ()
 include_directories("${PROJECT_SOURCE_DIR}/src" "${PROJECT_BINARY_DIR}/includes")
 
 target_link_libraries(
-  ${TARGET_NAME}
-  "${ZLIB_LIBRARIES}"
+  ${TARGET_NAME} "${ZLIB_LIBRARIES}"
+  Qt5::Gui Qt5::Network Qt5::Multimedia Qt5::OpenGL Qt5::Script Qt5::Svg Qt5::WebKitWidgets
 )
 
 # assume we are using a Qt build without bearer management
@@ -189,30 +189,11 @@ add_definitions(-DQT_NO_BEARERMANAGEMENT)
 
 if (APPLE)
     # link in required OS X frameworks and include the right GL headers
-    # find_library(AppKit AppKit)
- #    find_library(CoreAudio CoreAudio)
- #    find_library(CoreServices CoreServices)
- #    find_library(Carbon Carbon)
- #    find_library(Foundation Foundation)
- #    find_library(GLUT GLUT)
- #    find_library(OpenGL OpenGL)
- #    find_library(IOKit IOKit)
- #    find_library(QTKit QTKit)
- #    find_library(QuartzCore QuartzCore)
- #
- #    target_link_libraries(
- #        ${TARGET_NAME}
- #        ${AppKit}
- #        ${CoreAudio}
- #        ${CoreServices}
- #        ${Carbon}
- #        ${Foundation}
- #        ${GLUT}
- #        ${OpenGL}
- #        ${IOKit}
- #        ${QTKit}
- #        ${QuartzCore}
- #    )
+    find_library(CoreAudio CoreAudio)
+    find_library(GLUT GLUT)
+    find_library(OpenGL OpenGL)
+
+    target_link_libraries(${TARGET_NAME} ${CoreAudio} ${GLUT} ${OpenGL})
     
     # install command for OS X bundle
     INSTALL(TARGETS ${TARGET_NAME}

interface/src/devices/CaraFaceTracker.cpp

@@ -10,7 +10,7 @@
 //
 
 #include "CaraFaceTracker.h"
-#include <SharedUtil.h>
+#include <GLMHelpers.h>
 
 //qt
 #include <QJsonDocument>

interface/src/renderer/JointState.h

@@ -16,6 +16,7 @@
 #include <glm/gtx/quaternion.hpp>
 #include <glm/gtx/transform.hpp>
 
+#include <GLMHelpers.h>
 #include <FBXReader.h>
 
 class AngularConstraint;

interface/src/ui/overlays/Base3DOverlay.h

@@ -11,6 +11,8 @@
 #ifndef hifi_Base3DOverlay_h
 #define hifi_Base3DOverlay_h
 
+#include <glm/glm.hpp>
+
 #include "Overlay.h"
 
 class Base3DOverlay : public Overlay {

libraries/audio/src/InboundAudioStream.cpp

@@ -9,6 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <glm/glm.hpp>
+
 #include "InboundAudioStream.h"
 #include "PacketHeaders.h"
 

libraries/avatars/src/AvatarData.cpp

@@ -22,7 +22,7 @@
 #include <NetworkAccessManager.h>
 #include <NodeList.h>
 #include <PacketHeaders.h>
-#include <SharedUtil.h>
+#include <GLMHelpers.h>
 #include <StreamUtils.h>
 #include <UUID.h>
 #include <VoxelConstants.h>

libraries/avatars/src/HeadData.cpp

@@ -11,6 +11,7 @@
 
 #include <glm/gtx/quaternion.hpp>
 
+#include <GLMHelpers.h>
 #include <OctreeConstants.h>
 
 #include "AvatarData.h"

libraries/avatars/src/Referential.cpp

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <SharedUtil.h>
+#include <GLMHelpers.h>
 
 #include "AvatarData.h"
 #include "Referential.h"

libraries/fbx/src/FBXReader.cpp

@@ -23,9 +23,9 @@
 #include <glm/gtx/transform.hpp>
 
 #include <GeometryUtil.h>
+#include <GLMHelpers.h>
 #include <OctalCode.h>
 #include <Shape.h>
-#include <SharedUtil.h>
 
 #include <VoxelTree.h>
 

libraries/metavoxels/src/MetavoxelUtil.cpp

@@ -24,6 +24,8 @@
 #include <QVBoxLayout>
 #include <QtDebug>
 
+#include <GLMHelpers.h>
+
 #include "MetavoxelUtil.h"
 #include "ScriptCache.h"
 #include "StreamUtils.h"

libraries/models/src/ModelItem.cpp

@@ -11,19 +11,12 @@
 
 #include <QtCore/QObject>
 
+#include <GLMHelpers.h> 
 #include <Octree.h>
 #include <RegisteredMetaTypes.h>
-#include <SharedUtil.h> // usecTimestampNow()
 #include <VoxelsScriptingInterface.h>
 #include <VoxelDetail.h>
 
-
-// This is not ideal, but adding script-engine as a linked library, will cause a circular reference
-// I'm open to other potential solutions. Could we change cmake to allow libraries to reference each others
-// headers, but not link to each other, this is essentially what this construct is doing, but would be
-// better to add includes to the include path, but not link
-#include "../../script-engine/src/ScriptEngine.h"
-
 #include "ModelsScriptingInterface.h"
 #include "ModelItem.h"
 #include "ModelTree.h"

libraries/octree/src/OctreePacketData.cpp

@@ -9,7 +9,9 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+#include <GLMHelpers.h>
 #include <PerfStat.h>
+
 #include "OctreePacketData.h"
 
 bool OctreePacketData::_debug = false;

libraries/octree/src/OctreePacketData.h

@@ -22,7 +22,6 @@
 #ifndef hifi_OctreePacketData_h
 #define hifi_OctreePacketData_h
 
-#include <SharedUtil.h>
 #include "OctreeConstants.h"
 #include "OctreeElement.h"
 

libraries/octree/src/OctreeQuery.cpp

@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include <SharedUtil.h>
+#include <GLMHelpers.h>
 
 #include "OctreeConstants.h"
 #include "OctreeQuery.h"

libraries/particles/src/Particle.cpp

@@ -13,7 +13,7 @@
 
 #include <Octree.h>
 #include <RegisteredMetaTypes.h>
-#include <SharedUtil.h> // usecTimestampNow()
+#include <GLMHelpers.h>
 #include <VoxelsScriptingInterface.h>
 #include <VoxelDetail.h>
 

libraries/script-engine/src/Quat.cpp

@@ -14,7 +14,7 @@
 #include <QDebug>
 
 #include <OctreeConstants.h>
-#include <SharedUtil.h>
+#include <GLMHelpers.h>
 #include "Quat.h"