Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move sixense directory to lowercase, have find module look in env dir

Browse source
This commit is contained in:
Stephen Birarda 2014-03-07 09:59:24 -08:00
parent a364655f63
commit 3b06bbd88d
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitignore vendored
View file

@ -33,8 +33,8 @@ interface/external/oculus/*
!interface/external/oculus/readme.txt
# Ignore Sixense
interface/external/Sixense/*
!interface/external/Sixense/readme.txt
interface/external/sixense/*
!interface/external/sixense/readme.txt
# Ignore Visage
interface/external/visage/*

9
cmake/modules/FindSixense.cmake
View file

@ -16,12 +16,15 @@ if (SIXENSE_LIBRARIES AND SIXENSE_INCLUDE_DIRS)
# in cache already
set(SIXENSE_FOUND TRUE)
else (SIXENSE_LIBRARIES AND SIXENSE_INCLUDE_DIRS)
find_path(SIXENSE_INCLUDE_DIRS sixense.h ${SIXENSE_ROOT_DIR}/include)
set(SIXENSE_SEARCH_DIRS "${SIXENSE_ROOT_DIR}" "$ENV{HIFI_ROOT_DIR}/sixense")
find_path(SIXENSE_INCLUDE_DIRS include/sixense.h HINTS "${SIXENSE_SEARCH_DIRS}")
if (APPLE)
find_library(SIXENSE_LIBRARIES libsixense_x64.dylib ${SIXENSE_ROOT_DIR}/lib/osx_x64/release_dll)
find_library(SIXENSE_LIBRARIES lib/osx_x64/release_dll/libsixense_x64.dylib HINTS "${SIXENSE_SEARCH_DIRS}")
elseif (UNIX)
find_library(SIXENSE_LIBRARIES libsixense_x64.so ${SIXENSE_ROOT_DIR}/lib/linux_x64/release)
find_library(SIXENSE_LIBRARIES lib/linux_x64/release/libsixense_x64.so HINTS "${SIXENSE_SEARCH_DIRS}")
endif ()
if (SIXENSE_INCLUDE_DIRS AND SIXENSE_LIBRARIES)

0
interface/external/Sixense/readme.txt → interface/external/sixense/readme.txt vendored
View file