From a76ed5a34a4885c58a06470c262fdc5ec43155f5 Mon Sep 17 00:00:00 2001
From: asantamaria <angel.santamaria.navarro@jpl.nasa.gov>
Date: Tue, 16 Apr 2019 09:50:50 -0700
Subject: [PATCH] FIX installation paths to match iri drivers standard
---
Findlidar_lite.cmake | 4 ++--
src/CMakeLists.txt | 10 ++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Findlidar_lite.cmake b/Findlidar_lite.cmake
index 068b6d3..c056ec9 100644
--- a/Findlidar_lite.cmake
+++ b/Findlidar_lite.cmake
@@ -1,9 +1,9 @@
#edit the following line to add the librarie's header files
-FIND_PATH(lidar_lite_INCLUDE_DIR lidar_lite.h /usr/include/iri/lidar_lite /usr/local/include/iri/lidar_lite)
+FIND_PATH(lidar_lite_INCLUDE_DIR lidar_lite.h /usr/include/iridrivers/lidar_lite /usr/local/include/iridrivers/lidar_lite)
FIND_LIBRARY(lidar_lite_LIBRARY
NAMES lidar_lite
- PATHS /usr/lib /usr/lib/iri/lidar_lite /usr/local/lib /usr/local/lib/iri/lidar_lite)
+ PATHS /usr/lib /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers)
SET(lidar_lite_INCLUDE_DIRS ${lidar_lite_INCLUDE_DIR})
SET(lidar_lite_LIBRARIES ${lidar_lite_LIBRARY})
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 23ef63c..d69bf8b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,11 +37,13 @@ else()
endif()
# install
+
INSTALL(TARGETS lidar_lite
- RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib/iri/${PROJECT_NAME}
- ARCHIVE DESTINATION lib/iri/${PROJECT_NAME})
-INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
+ RUNTIME DESTINATION bin
+ LIBRARY DESTINATION lib/iridrivers
+ ARCHIVE DESTINATION lib/iridrivers
+)
+INSTALL(FILES ${headers} DESTINATION include/iridrivers/${PROJECT_NAME})
INSTALL(FILES ../Findlidar_lite.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
INSTALL(FILES ../99-lidar_lite.rules DESTINATION /etc/udev/rules.d/)
--
GitLab