Merge pull request #661 from birarda/master

link STK to interface for sound generation
This commit is contained in:
Stephen Birarda 2013-07-12 11:18:52 -07:00
commit 1c72362ed1

View file

@ -99,6 +99,10 @@ find_package(OpenNI)
find_package(UVCCameraControl) find_package(UVCCameraControl)
find_package(ZLIB) find_package(ZLIB)
# link the stk library
set(STK_ROOT_DIR ${ROOT_DIR}/externals/stk)
find_package(STK REQUIRED)
# let the source know that we have OpenNI/NITE for Kinect # let the source know that we have OpenNI/NITE for Kinect
if (OPENNI_FOUND) if (OPENNI_FOUND)
add_definitions(-DHAVE_OPENNI) add_definitions(-DHAVE_OPENNI)
@ -122,6 +126,7 @@ include_directories(
${LEAP_INCLUDE_DIRS} ${LEAP_INCLUDE_DIRS}
${MOTIONDRIVER_INCLUDE_DIRS} ${MOTIONDRIVER_INCLUDE_DIRS}
${OPENCV_INCLUDE_DIRS} ${OPENCV_INCLUDE_DIRS}
${STK_INCLUDE_DIRS}
) )
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OPENCV_INCLUDE_DIRS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${OPENCV_INCLUDE_DIRS}")
@ -131,6 +136,7 @@ target_link_libraries(
${MOTIONDRIVER_LIBRARIES} ${MOTIONDRIVER_LIBRARIES}
${OPENCV_LIBRARIES} ${OPENCV_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${STK_LIBRARIES}
fervor fervor
) )