Skip to content

Commit e59e4ef

Browse files
committed
examples: Trim dependencies
Signed-off-by: Benn Snyder <[email protected]>
1 parent 1a381ad commit e59e4ef

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

examples/CMakeLists.txt

+5-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ target_link_libraries(freenect-wavrecord freenect)
1010
install(TARGETS freenect-camtest freenect-wavrecord
1111
DESTINATION bin)
1212

13-
# All viewers need pthreads and GLUT.
13+
# Most viewers need pthreads and GLUT.
1414
set(THREADS_USE_PTHREADS_WIN32 true)
1515
find_package(Threads)
1616
find_package(OpenGL)
@@ -37,22 +37,21 @@ endif ()
3737

3838
# A few examples use c_sync.
3939
if (BUILD_C_SYNC)
40-
find_package(Threads REQUIRED)
4140
include_directories(../wrappers/c_sync/)
42-
include_directories(${THREADS_PTHREADS_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
4341

4442
add_executable(freenect-regtest regtest.c)
4543
add_executable(freenect-tiltdemo tiltdemo.c)
4644

47-
target_link_libraries(freenect-regtest freenect_sync ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
48-
target_link_libraries(freenect-tiltdemo freenect_sync ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
45+
target_link_libraries(freenect-regtest freenect_sync ${MATH_LIB})
46+
target_link_libraries(freenect-tiltdemo freenect_sync ${MATH_LIB})
4947

5048
install(TARGETS freenect-regtest freenect-tiltdemo
5149
DESTINATION bin)
5250

5351
if (OPENGL_FOUND AND GLUT_FOUND)
52+
include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
5453
add_executable(freenect-glpclview glpclview.c)
55-
target_link_libraries(freenect-glpclview freenect_sync ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
54+
target_link_libraries(freenect-glpclview freenect_sync ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${MATH_LIB})
5655
install(TARGETS freenect-glpclview
5756
DESTINATION bin)
5857
endif ()

wrappers/cpp/CMakeLists.txt

+12-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@ install(FILES libfreenect.hpp
33

44
if (BUILD_EXAMPLES)
55
set(THREADS_USE_PTHREADS_WIN32 true)
6-
find_package(Threads REQUIRED)
7-
find_package(OpenGL REQUIRED)
8-
find_package(GLUT REQUIRED)
6+
find_package(Threads)
7+
find_package(OpenGL)
8+
find_package(GLUT)
99

10-
include_directories(. ${THREADS_PTHREADS_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
10+
if (Threads_FOUND AND OPENGL_FOUND AND GLUT_FOUND)
11+
include_directories(. ${THREADS_PTHREADS_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
1112

12-
add_executable(freenect-cppview cppview.cpp)
13-
add_executable(freenect-cpp_pcview cpp_pc_view.cpp)
13+
add_executable(freenect-cppview cppview.cpp)
14+
add_executable(freenect-cpp_pcview cpp_pc_view.cpp)
1415

15-
target_link_libraries(freenect-cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
16-
target_link_libraries(freenect-cpp_pcview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
16+
target_link_libraries(freenect-cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
17+
target_link_libraries(freenect-cpp_pcview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
1718

18-
install(TARGETS freenect-cppview freenect-cpp_pcview
19-
DESTINATION bin)
19+
install(TARGETS freenect-cppview freenect-cpp_pcview
20+
DESTINATION bin)
21+
endif()
2022
ENDIF()

0 commit comments

Comments
 (0)