CMake|Oculus Rift: Updated SDK config for LibOVR 0.5.0.1

skyjake · Apr 3, 2015 · f62ef3a · f62ef3a
1 parent 517cd8b
commit f62ef3a
Showing 1 changed file with 17 additions and 8 deletions.
diff --git a/doomsday/cmake/FindOculusVR.cmake b/doomsday/cmake/FindOculusVR.cmake
@@ -1,8 +1,9 @@
 # This is the version of LibOVR that is required.
-set (LIBOVR_REQUIRED_VERSION 0.4.4)
+set (LIBOVR_REQUIRED_VERSION 0.5.0.1)
 
-set (LIBOVR_DIR "" CACHE PATH "Location of the LibOVR library (in the Oculus SDK)")
+option (DENG_ENABLE_OCULUS "Enable/disable Oculus Rift support (if LibOVR was found)" ON)
 
+set (LIBOVR_DIR "" CACHE PATH "Location of the LibOVR library (in the Oculus SDK)")
 set (_oldPath ${LIBOVR_OVR_H})
 
 find_file (LIBOVR_OVR_H Include/OVR.h
@@ -18,11 +19,19 @@ if (NOT _oldPath STREQUAL LIBOVR_OVR_H)
         # Check the version.
         get_filename_component (ovrDir "${LIBOVR_OVR_H}" DIRECTORY)
         file (READ ${ovrDir}/OVR_Version.h _ovrVersionHeader)
-        string (REGEX MATCH ".*#define OVR_VERSION_STRING \"([0-9\\.-]+)\".*" _match 
-            ${_ovrVersionHeader}
-        )
-        set (ovrVersion ${CMAKE_MATCH_1})
-        set (_match)
+        string (REGEX MATCH ".*#define OVR_PRODUCT_VERSION[ \t]+([0-9\\.-]+).*" _match ${_ovrVersionHeader})
+        set (_product ${CMAKE_MATCH_1})
+        string (REGEX MATCH ".*#define OVR_MAJOR_VERSION[ \t]+([0-9\\.-]+).*" _match ${_ovrVersionHeader})
+        set (_major ${CMAKE_MATCH_1})
+        string (REGEX MATCH ".*#define OVR_MINOR_VERSION[ \t]+([0-9\\.-]+).*" _match ${_ovrVersionHeader})
+        set (_minor ${CMAKE_MATCH_1})
+        string (REGEX MATCH ".*#define OVR_PATCH_VERSION[ \t]+([0-9\\.-]+).*" _match ${_ovrVersionHeader})
+        set (_patch ${CMAKE_MATCH_1})
+        set (ovrVersion ${_product}.${_major}.${_minor}.${_patch})
+        set (_product)
+        set (_major)
+        set (_minor)
+        set (_patch)
         set (_ovrVersionHeader)
         message (STATUS "Looking for LibOVR - found version ${ovrVersion}")
         if (NOT ovrVersion VERSION_EQUAL LIBOVR_REQUIRED_VERSION)
@@ -33,7 +42,7 @@ if (NOT _oldPath STREQUAL LIBOVR_OVR_H)
     endif ()
 endif ()
 
-if (LIBOVR_OVR_H)
+if (LIBOVR_OVR_H AND DENG_ENABLE_OCULUS)
     if (NOT TARGET LibOVR)
         get_filename_component (ovrDir "${LIBOVR_OVR_H}" DIRECTORY)
         get_filename_component (ovrDir "${ovrDir}" DIRECTORY)