Updating cmake files after merging from master

CMakeLists.txt

@@ -158,6 +158,8 @@ option(GET_GLM "Get GLM library automatically as external project" 1)
 option(GET_GVERB "Get Gverb library automatically as external project" 1)
 option(GET_SOXR "Get Soxr library automatically as external project" 1)
 option(GET_TBB "Get Threading Building Blocks library automatically as external project" 1)
+option(GET_LIBOVR "Get LibOVR library automatically as external project" 1)
+option(USE_NSIGHT "Attempt to find the nSight libraries" 1)
 
 if (WIN32)
   option(GET_GLEW "Get GLEW library automatically as external project" 1)

cmake/externals/LibOVR/CMakeLists.txt

@@ -11,12 +11,10 @@ ExternalProject_Add(
 
 ExternalProject_Get_Property(${EXTERNAL_NAME} INSTALL_DIR)
 
+message(${INSTALL_DIR})
+
 string(TOUPPER ${EXTERNAL_NAME} EXTERNAL_NAME_UPPER)
 
 set(${EXTERNAL_NAME_UPPER}_INCLUDE_DIRS ${INSTALL_DIR}/include  CACHE TYPE STRING)
-
+set(${EXTERNAL_NAME_UPPER}_LIBRARY_RELEASE ${INSTALL_DIR}/lib/ovr.lib CACHE TYPE FILEPATH)
-if (WIN32) 
+set(${EXTERNAL_NAME_UPPER}_LIBRARY_DEBUG ${INSTALL_DIR}/lib/ovrd.lib  CACHE TYPE FILEPATH)
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/ovr.lib  CACHE TYPE STRING)
-else ()
-  set(${EXTERNAL_NAME_UPPER}_LIBRARIES ${INSTALL_DIR}/lib/libovr.a  CACHE TYPE STRING)
-endif ()

cmake/modules/FindLibOVR.cmake

@@ -21,7 +21,11 @@
 include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
 hifi_library_search_hints("libovr")
 
+find_library(LIBOVR_LIBRARY_RELEASE ovr PATH_SUFFIXES "lib" HINTS ${LIBOVR_SEARCH_DIRS})
+find_library(LIBOVR_LIBRARY_DEBUG ovr PATH_SUFFIXES "lib" HINTS ${LIBOVR_SEARCH_DIRS})
+
 include(SelectLibraryConfigurations)
+select_library_configurations(LIBOVR)
 
 if (NOT ANDROID)
     include("${MACRO_DIR}/HifiLibrarySearchHints.cmake")
@@ -29,11 +33,18 @@ if (NOT ANDROID)
     
     find_path(LIBOVR_INCLUDE_DIRS OVR_CAPI.h PATH_SUFFIXES include HINTS ${LIBOVR_SEARCH_DIRS})
     find_library(LIBOVR_LIBRARIES ovr PATH_SUFFIXES lib HINTS ${LIBOVR_SEARCH_DIRS})
-    list(APPEND LIBOVR_LIBRARIES setupapi winmm ws2_32)
 
     include(FindPackageHandleStandardArgs)
     find_package_handle_standard_args(LIBOVR DEFAULT_MSG LIBOVR_INCLUDE_DIRS LIBOVR_LIBRARIES)
 
+    if (WIN32)
+        list(APPEND LIBOVR_LIBRARIES setupapi winmm ws2_32)
+    elseif(APPLE)
+        find_library(COCOA_LIBRARY Cocoa)
+        find_library(IOKIT_LIBRARY IOKit)
+        list(APPEND LIBOVR_LIBRARIES ${COCOA_LIBRARY} ${IOKIT_LIBRARY})
+    endif()
+
 else (NOT ANDROID)  
   set(_VRLIB_JNI_DIR "VRLib/jni")
   set(_VRLIB_LIBS_DIR "VRLib/obj/local/armeabi-v7a")

interface/CMakeLists.txt

@@ -2,11 +2,7 @@ set(TARGET_NAME interface)
 project(${TARGET_NAME})
 
 # set a default root dir for each of our optional externals if it was not passed
-<<<<<<< HEAD
+set(OPTIONAL_EXTERNALS "Faceshift" "Sixense" "LeapMotion" "RtMidi" "SDL2" "RSSDK")
-set(OPTIONAL_EXTERNALS "Faceshift" "PrioVR" "Sixense" "LeapMotion" "RtMidi" "Qxmpp" "SDL2" "RSSDK")
-=======
-set(OPTIONAL_EXTERNALS "Faceshift" "LibOVR" "Sixense" "LeapMotion" "RtMidi" "SDL2" "RSSDK")
->>>>>>> upstream/master
 foreach(EXTERNAL ${OPTIONAL_EXTERNALS})
   string(TOUPPER ${EXTERNAL} ${EXTERNAL}_UPPERCASE)
   if (NOT ${${EXTERNAL}_UPPERCASE}_ROOT_DIR)
@@ -114,7 +110,7 @@ add_dependency_external_projects(glm bullet)
 find_package(GLM REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${GLM_INCLUDE_DIRS})
 
-add_dependency_external_project(LibOVR)
+add_dependency_external_projects(LibOVR)
 find_package(LibOVR REQUIRED)
 target_include_directories(${TARGET_NAME} PRIVATE ${LIBOVR_INCLUDE_DIRS})
 target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES})
@@ -229,15 +225,17 @@ else (APPLE)
     find_package(GLEW REQUIRED)
     target_include_directories(${TARGET_NAME} PRIVATE ${GLEW_INCLUDE_DIRS})
 
-    target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} ${NSIGHT_LIBRARIES} wsock32.lib opengl32.lib Winmm.lib)
+    target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} wsock32.lib opengl32.lib Winmm.lib)
 
-    # try to find the Nsight package and add it to the build if we find it
+    if (USE_NSIGHT)
-    find_package(NSIGHT)
+      # try to find the Nsight package and add it to the build if we find it
-    if (NSIGHT_FOUND)
+      find_package(NSIGHT)
-      include_directories(${NSIGHT_INCLUDE_DIRS})
+      if (NSIGHT_FOUND)
-      add_definitions(-DNSIGHT_FOUND)
+        include_directories(${NSIGHT_INCLUDE_DIRS})
-      target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
+        add_definitions(-DNSIGHT_FOUND)
-    endif ()
+        target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
+      endif ()
+    endif()
 
   endif()
 endif (APPLE)

interface/src/devices/OculusManager.cpp

@@ -31,7 +31,6 @@
 
 #include "Application.h"
 
-#include "OVR_Math.h"
 #include "OVR_Version.h"
 using namespace OVR;
 
@@ -659,10 +658,10 @@ void OculusManager::reset() {
 void OculusManager::getEulerAngles(float& yaw, float& pitch, float& roll) {
     ovrTrackingState ts = ovrHmd_GetTrackingState(_ovrHmd, ovr_GetTimeInSeconds());
     if (ts.StatusFlags & (ovrStatus_OrientationTracked | ovrStatus_PositionTracked)) {
-        
+        glm::vec3 euler = glm::eulerAngles(toGlm(ts.HeadPose.ThePose.Orientation));
-        ovrPosef headPose = ts.HeadPose.ThePose;
+        yaw = euler.y;
-        Quatf orientation = Quatf(headPose.Orientation);
+        pitch = euler.x;
-        orientation.GetEulerAngles<Axis_Y, Axis_X, Axis_Z, Rotate_CCW, Handed_R>(&yaw, &pitch, &roll);
+        roll = euler.z;
     } else {
         yaw = 0.0f;
         pitch = 0.0f;

libraries/gpu/CMakeLists.txt

@@ -19,13 +19,16 @@ elseif (WIN32)
 
   target_link_libraries(${TARGET_NAME} ${GLEW_LIBRARIES} opengl32.lib)
 
-  # try to find the Nsight package and add it to the build if we find it
+  if (USE_NSIGHT)
-  find_package(NSIGHT)
+    # try to find the Nsight package and add it to the build if we find it
-  if (NSIGHT_FOUND)
+    find_package(NSIGHT)
-    include_directories(${NSIGHT_INCLUDE_DIRS})
+    if (NSIGHT_FOUND)
-    add_definitions(-DNSIGHT_FOUND)
+      include_directories(${NSIGHT_INCLUDE_DIRS})
-    target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
+      add_definitions(-DNSIGHT_FOUND)
-  endif ()
+      target_link_libraries(${TARGET_NAME} "${NSIGHT_LIBRARIES}")
+    endif ()
+  endif()
+  
 elseif (ANDROID)
   target_link_libraries(${TARGET_NAME} "-lGLESv3" "-lEGL")
 else ()