i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-01 17:10:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use standard CMAKE_INSTALL_{BIN,LIB}DIR instead of INSTALL_{BIN,LIB}_DIR.

Browse Source 
Overriding the latters caused me to see these files installed in ${DESTDIR}/${BUILD_DIR}
This commit is contained in:
Alexis Ballier
2014-12-17 17:28:21 +01:00
parent 744e2fb3c7
commit d8db777d7c
12 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/Calibration/CMakeLists.txt
View File

@@ -25,5 +25,5 @@ SET_TARGET_PROPERTIES( calibration
PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-calibration)
INSTALL(TARGETS calibration
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)

2
tools/CameraRGBD/CMakeLists.txt
View File

@@ -21,5 +21,5 @@ SET_TARGET_PROPERTIES( rgbd_camera
PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-rgbd_camera)
INSTALL(TARGETS rgbd_camera
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)

2
tools/ConsoleApp/CMakeLists.txt
View File

@@ -31,6 +31,6 @@ SET_TARGET_PROPERTIES( consoleApp
PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-console)
INSTALL(TARGETS consoleApp
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)

2
tools/DataRecorder/CMakeLists.txt
View File

@@ -33,5 +33,5 @@ SET_TARGET_PROPERTIES( dataRecorder
PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-dataRecorder)
INSTALL(TARGETS dataRecorder
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)

2
tools/DatabaseViewer/CMakeLists.txt
View File

@@ -35,5 +35,5 @@ SET_TARGET_PROPERTIES( databaseViewer
PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-databaseViewer)
INSTALL(TARGETS databaseViewer
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)

2
tools/ExtractObject/CMakeLists.txt
View File

@@ -26,5 +26,5 @@ SET_TARGET_PROPERTIES( extractObject
PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-extractObject)
INSTALL(TARGETS extractObject
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)

2
tools/OdometryViewer/CMakeLists.txt
View File

@@ -33,6 +33,6 @@ SET_TARGET_PROPERTIES( odometryViewer
PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-odometryViewer)
INSTALL(TARGETS odometryViewer
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)