Fixed: Update libovr detection

--HG--
branch : develop

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

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

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