Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 12:04:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

also look in HIFI_LIB_DIR for oculus lib

Browse source
This commit is contained in:
Stephen Birarda 2014-03-07 10:03:16 -08:00
parent 3b06bbd88d
commit aef15b86bf
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmake/modules/FindLibOVR.cmake
View file

@ -16,10 +16,12 @@ if (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS)
# in cache already # in cache already
set(LIBOVR_FOUND TRUE) set(LIBOVR_FOUND TRUE)
else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS) else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS)
find_path(LIBOVR_INCLUDE_DIRS OVR.h "${LIBOVR_ROOT_DIR}/Include") set(LIBOVR_SEARCH_DIRS "${LIBOVR_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/sixense")
find_path(LIBOVR_INCLUDE_DIRS Include/OVR.h HINTS "${LIBOVR_SEARCH_DIRS}")
if (APPLE) if (APPLE)
find_library(LIBOVR_LIBRARIES libovr.a "${LIBOVR_ROOT_DIR}/Lib/MacOS/${CMAKE_BUILD_TYPE}/") find_library(LIBOVR_LIBRARIES "Lib/MacOS/${CMAKE_BUILD_TYPE}/libovr.a" HINTS "${LIBOVR_SEARCH_PATHS}")
elseif (UNIX) elseif (UNIX)
find_library(UDEV_LIBRARY libudev.a /usr/lib/x86_64-linux-gnu/) find_library(UDEV_LIBRARY libudev.a /usr/lib/x86_64-linux-gnu/)
find_library(XINERAMA_LIBRARY libXinerama.a /usr/lib/x86_64-linux-gnu/) find_library(XINERAMA_LIBRARY libXinerama.a /usr/lib/x86_64-linux-gnu/)
@ -30,7 +32,7 @@ else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS)
set(LINUX_ARCH_DIR "x86_64") set(LINUX_ARCH_DIR "x86_64")
endif() endif()
find_library(OVR_LIBRARY libovr.a "${LIBOVR_ROOT_DIR}/Lib/Linux/${CMAKE_BUILD_TYPE}/${LINUX_ARCH_DIR}/") find_library(OVR_LIBRARY "Lib/Linux/${CMAKE_BUILD_TYPE}/${LINUX_ARCH_DIR}/libovr.a" HINTS "${LIBOVR_SEARCH_PATHS}")
if (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY) if (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY)
set(LIBOVR_LIBRARIES "${OVR_LIBRARY};${UDEV_LIBRARY};${XINERAMA_LIBRARY}" CACHE INTERNAL "Oculus libraries") set(LIBOVR_LIBRARIES "${OVR_LIBRARY};${UDEV_LIBRARY};${XINERAMA_LIBRARY}" CACHE INTERNAL "Oculus libraries")
endif (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY) endif (UDEV_LIBRARY AND XINERAMA_LIBRARY AND OVR_LIBRARY)
@ -53,7 +55,7 @@ else (LIBOVR_LIBRARIES AND LIBOVR_INCLUDE_DIRS)
endif() endif()
endif() endif()
find_library(LIBOVR_LIBRARIES ${LIBOVR_NAME} "${LIBOVR_ROOT_DIR}/Lib/${WINDOWS_ARCH_DIR}/") find_library(LIBOVR_LIBRARIES "Lib/${WINDOWS_ARCH_DIR}/${LIBOVR_NAME}" HINTS "${LIBOVR_SEARCH_DIRS}")
endif () endif ()
if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES) if (LIBOVR_INCLUDE_DIRS AND LIBOVR_LIBRARIES)

2
cmake/modules/FindSixense.cmake
View file

@ -17,7 +17,7 @@ if (SIXENSE_LIBRARIES AND SIXENSE_INCLUDE_DIRS)
set(SIXENSE_FOUND TRUE) set(SIXENSE_FOUND TRUE)
else (SIXENSE_LIBRARIES AND SIXENSE_INCLUDE_DIRS) else (SIXENSE_LIBRARIES AND SIXENSE_INCLUDE_DIRS)
set(SIXENSE_SEARCH_DIRS "${SIXENSE_ROOT_DIR}" "$ENV{HIFI_ROOT_DIR}/sixense") set(SIXENSE_SEARCH_DIRS "${SIXENSE_ROOT_DIR}" "$ENV{HIFI_LIB_DIR}/sixense")
find_path(SIXENSE_INCLUDE_DIRS include/sixense.h HINTS "${SIXENSE_SEARCH_DIRS}") find_path(SIXENSE_INCLUDE_DIRS include/sixense.h HINTS "${SIXENSE_SEARCH_DIRS}")