Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-22 20:29:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into 19734

Browse source 
Conflicts:
	cmake/modules/FindLeapMotion.cmake
	interface/CMakeLists.txt
	interface/src/devices/Leapmotion.h
This commit is contained in:
samcake 2014-07-08 12:43:32 -07:00
commit f179b0e9ca
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/CMakeLists.txt
View file

@ -21,6 +21,7 @@ set(VISAGE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/visage")
set(LEAPMOTION_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/leapmotion") set(LEAPMOTION_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/leapmotion")
set(RTMIDI_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/rtmidi") set(RTMIDI_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/rtmidi")
find_package(Qt5LinguistTools REQUIRED) find_package(Qt5LinguistTools REQUIRED)
find_package(Qt5LinguistToolsMacros) find_package(Qt5LinguistToolsMacros)
@ -150,7 +151,6 @@ find_package(PrioVR)
find_package(SDL) find_package(SDL)
find_package(Sixense) find_package(Sixense)
find_package(Visage) find_package(Visage)
find_package(LeapMotion)
find_package(ZLIB) find_package(ZLIB)
find_package(Qxmpp) find_package(Qxmpp)
@ -210,6 +210,7 @@ if (PRIOVR_FOUND AND NOT DISABLE_PRIOVR)
target_link_libraries(${TARGET_NAME} "${PRIOVR_LIBRARIES}") target_link_libraries(${TARGET_NAME} "${PRIOVR_LIBRARIES}")
endif (PRIOVR_FOUND AND NOT DISABLE_PRIOVR) endif (PRIOVR_FOUND AND NOT DISABLE_PRIOVR)
<<<<<<< HEAD
# and with LeapMotion library # and with LeapMotion library
if (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION) if (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
add_definitions(-DHAVE_LEAPMOTION) add_definitions(-DHAVE_LEAPMOTION)
@ -221,6 +222,8 @@ if (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
target_link_libraries(${TARGET_NAME} "${LEAPMOTION_LIBRARIES}") target_link_libraries(${TARGET_NAME} "${LEAPMOTION_LIBRARIES}")
endif (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION) endif (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
=======
>>>>>>> origin/master
# and with SDL for joysticks # and with SDL for joysticks
if (SDL_FOUND AND NOT DISABLE_SDL) if (SDL_FOUND AND NOT DISABLE_SDL)
add_definitions(-DHAVE_SDL) add_definitions(-DHAVE_SDL)

3
interface/external/leapmotion/readme.txt vendored
View file

@ -2,7 +2,8 @@
Instructions for adding the Leap Motion library (LeapSDK) to Interface Instructions for adding the Leap Motion library (LeapSDK) to Interface
Sam Cake, June 10, 2014 Sam Cake, June 10, 2014
You can download the Leap Developer Kit from https://developer.leapmotion.com/ (account creation required). Interface has been tested with SDK version LeapDeveloperKit_2.0.2+16391_win. You can download the Leap Developer Kit from https://developer.leapmotion.com/ (account creation required).
Interface has been tested with SDK version LeapDeveloperKit_2.0.2+16391_win.
1. Copy the LeapSDK folders from the LeapDeveloperKit installation directory (Lib, Include) into the interface/externals/leapmotion folder. 1. Copy the LeapSDK folders from the LeapDeveloperKit installation directory (Lib, Include) into the interface/externals/leapmotion folder.
This readme.txt should be there as well. This readme.txt should be there as well.