From 4bb2195a79247df985ad062c2e24ed18c35c71e4 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Mon, 31 Oct 2016 19:00:19 +0100
Subject: [PATCH] Fixed: Update libovr detection

---
 code/CMakeLists.txt                | 12 ++++++++++--
 code/CMakeModules/FindLibOVR.cmake |  3 ++-
 code/nel/CMakeLists.txt            |  8 --------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index fa5cadefd..3e1f503a8 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -93,8 +93,6 @@ NL_SETUP_SNOWBALLS_DEFAULT_OPTIONS()
 NL_SETUP_PREFIX_PATHS()
 RYZOM_SETUP_PREFIX_PATHS()
 
-NL_CONFIGURE_CHECKS()
-
 NL_SETUP_BUILD()
 NL_SETUP_BUILD_FLAGS()
 
@@ -118,6 +116,16 @@ FIND_PACKAGE(OpenSSL REQUIRED)
 FIND_PACKAGE(GIF)
 FIND_PACKAGE(Jpeg)
 
+IF(WITH_LIBOVR)
+  FIND_PACKAGE(LibOVR)
+ENDIF()
+
+IF(WITH_LIBVR)
+  FIND_PACKAGE(LibVR)
+ENDIF()
+
+NL_CONFIGURE_CHECKS()
+
 IF(WITH_STATIC_LIBXML2)
   SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
 ENDIF()
diff --git a/code/CMakeModules/FindLibOVR.cmake b/code/CMakeModules/FindLibOVR.cmake
index 330835edf..081fa0bca 100644
--- a/code/CMakeModules/FindLibOVR.cmake
+++ b/code/CMakeModules/FindLibOVR.cmake
@@ -10,7 +10,8 @@ IF(LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIR)
 ENDIF()
 
 FIND_PATH(LIBOVR_INCLUDE_DIR
-  OVR.h
+  NAMES
+  OVR.h OVR_CAPI.h
   PATHS
   $ENV{LIBOVR_DIR}/Include
   /usr/local/include
diff --git a/code/nel/CMakeLists.txt b/code/nel/CMakeLists.txt
index 167737833..0f1d11579 100644
--- a/code/nel/CMakeLists.txt
+++ b/code/nel/CMakeLists.txt
@@ -37,14 +37,6 @@ IF(WITH_GTK)
   FIND_PACKAGE(GTK2)
 ENDIF()
 
-IF(WITH_LIBOVR)
-  FIND_PACKAGE(LibOVR)
-ENDIF()
-
-IF(WITH_LIBVR)
-  FIND_PACKAGE(LibVR)
-ENDIF()
-
 IF(WITH_INSTALL_LIBRARIES)
   IF(UNIX)
     SET(prefix ${CMAKE_INSTALL_PREFIX})