Skip to content

Commit bf5c87e

Browse files
committed
Prefix freenect- to the name of the installed demos
This prefix is added to avoid name clashes with other binaries installed on the system. Signed-off-by: Nicolas Bourdaud <nicolas.bourdaud@gmail.com>
1 parent c851717 commit bf5c87e

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

examples/CMakeLists.txt

100755100644
Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ if (WIN32)
1717
include_directories(${THREADS_PTHREADS_INCLUDE_DIR})
1818
endif()
1919

20-
add_executable(glview glview.c)
21-
add_executable(regview regview.c)
22-
add_executable(hiview hiview.c)
20+
add_executable(freenect-glview glview.c)
21+
add_executable(freenect-regview regview.c)
22+
add_executable(freenect-hiview hiview.c)
2323
if(BUILD_AUDIO)
24-
add_executable(wavrecord wavrecord.c)
25-
add_executable(micview micview.c)
24+
add_executable(freenect-wavrecord wavrecord.c)
25+
add_executable(freenect-micview micview.c)
2626
endif()
2727

2828
if (BUILD_C_SYNC)
29-
add_executable(glpclview glpclview.c)
30-
add_executable(tiltdemo tiltdemo.c)
31-
add_executable(regtest regtest.c)
29+
add_executable(freenect-glpclview glpclview.c)
30+
add_executable(freenect-tiltdemo tiltdemo.c)
31+
add_executable(freenect-regtest regtest.c)
3232
endif()
3333

3434
# We need to include libfreenect_sync.h for glpclview
@@ -37,17 +37,17 @@ include_directories (../wrappers/c_sync/)
3737
# Mac just has everything already
3838
if(APPLE)
3939
set(CMAKE_EXE_LINKER_FLAGS "-framework OpenGL -framework GLUT")
40-
target_link_libraries(glview freenect)
41-
target_link_libraries(regview freenect)
42-
target_link_libraries(hiview freenect)
40+
target_link_libraries(freenect-glview freenect)
41+
target_link_libraries(freenect-regview freenect)
42+
target_link_libraries(freenect-hiview freenect)
4343
if (BUILD_AUDIO)
44-
target_link_libraries(wavrecord freenect)
45-
target_link_libraries(micview freenect)
44+
target_link_libraries(freenect-wavrecord freenect)
45+
target_link_libraries(freenect-micview freenect)
4646
endif()
4747
if (BUILD_C_SYNC)
48-
target_link_libraries(glpclview freenect_sync)
49-
target_link_libraries(tiltdemo freenect_sync)
50-
target_link_libraries(regtest freenect_sync)
48+
target_link_libraries(freenect-glpclview freenect_sync)
49+
target_link_libraries(freenect-tiltdemo freenect_sync)
50+
target_link_libraries(freenect-regtest freenect_sync)
5151
endif()
5252
# Linux, not so much
5353
else()
@@ -58,31 +58,31 @@ else()
5858

5959
include_directories(${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ${USB_INCLUDE_DIRS})
6060

61-
target_link_libraries(glview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
62-
target_link_libraries(regview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
63-
target_link_libraries(hiview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
61+
target_link_libraries(freenect-glview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
62+
target_link_libraries(freenect-regview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
63+
target_link_libraries(freenect-hiview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
6464
if (BUILD_AUDIO)
65-
target_link_libraries(wavrecord freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
66-
target_link_libraries(micview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
65+
target_link_libraries(freenect-wavrecord freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
66+
target_link_libraries(freenect-micview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
6767
endif()
6868
if (BUILD_C_SYNC)
69-
target_link_libraries(glpclview freenect_sync ${OPENGL_LIBRARIES} ${GLUT_LIBRARY}
69+
target_link_libraries(freenect-glpclview freenect_sync ${OPENGL_LIBRARIES} ${GLUT_LIBRARY}
7070
${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
71-
target_link_libraries(tiltdemo freenect_sync ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
72-
target_link_libraries(regtest freenect_sync ${CMAKE_THREAD_LIBS_INIT})
71+
target_link_libraries(freenect-tiltdemo freenect_sync ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
72+
target_link_libraries(freenect-regtest freenect_sync ${CMAKE_THREAD_LIBS_INIT})
7373
endif()
7474
endif()
7575

7676

77-
install (TARGETS glview regview hiview
77+
install (TARGETS freenect-glview freenect-regview freenect-hiview
7878
DESTINATION bin)
7979

8080
if (BUILD_C_SYNC)
81-
install (TARGETS glpclview tiltdemo
81+
install (TARGETS freenect-glpclview freenect-tiltdemo
8282
DESTINATION bin)
8383
endif()
8484

8585
if (BUILD_AUDIO)
86-
install (TARGETS wavrecord DESTINATION bin)
87-
install (TARGETS micview DESTINATION bin)
86+
install (TARGETS freenect-wavrecord DESTINATION bin)
87+
install (TARGETS freenect-micview DESTINATION bin)
8888
endif()

wrappers/cpp/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ endif()
1414

1515
include_directories(.)
1616

17-
add_executable(cppview cppview.cpp)
17+
add_executable(freenect-cppview cppview.cpp)
1818

1919
# Mac just has everything already
2020
if(APPLE)
2121
set(CMAKE_EXE_LINKER_FLAGS "-framework OpenGL -framework GLUT")
22-
target_link_libraries(cppview freenect)
22+
target_link_libraries(freenect-cppview freenect)
2323
else()
2424
find_package(Threads REQUIRED)
2525
find_package(OpenGL REQUIRED)
2626
find_package(GLUT REQUIRED)
2727

2828
include_directories(${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ${USB_INCLUDE_DIRS})
2929

30-
target_link_libraries(cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
30+
target_link_libraries(freenect-cppview freenect ${OPENGL_LIBRARIES} ${GLUT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} ${MATH_LIB})
3131
endif()
3232

33-
install (TARGETS cppview
33+
install (TARGETS freenect-cppview
3434
DESTINATION bin)
3535

3636
ENDIF()

wrappers/opencv/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ install (TARGETS freenect_cv
1616
install (FILES "libfreenect_cv.h"
1717
DESTINATION ${PROJECT_INCLUDE_INSTALL_DIR})
1818

19-
add_executable(cvdemo cvdemo.c)
20-
target_link_libraries(cvdemo freenect freenect_sync freenect_cv ${OpenCV_LIBS})
21-
install (TARGETS cvdemo
19+
add_executable(freenect-cvdemo cvdemo.c)
20+
target_link_libraries(freenect-cvdemo freenect freenect_sync freenect_cv ${OpenCV_LIBS})
21+
install (TARGETS freenect-cvdemo
2222
DESTINATION bin)

0 commit comments

Comments
 (0)