From b8f746db056fa2948d70567bc49b791aa31be7cb Mon Sep 17 00:00:00 2001
From: Alopez <alopez@iri.upc.edu>
Date: Thu, 29 Aug 2019 12:18:20 +0200
Subject: [PATCH] Adapted to the new installation directories
---
Findlidar_lite.cmake | 4 ++--
src/CMakeLists.txt | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Findlidar_lite.cmake b/Findlidar_lite.cmake
index daf9b21..214767a 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 exceptions.h lidar_lite_exceptions.h /usr/include/iridrivers/lidar_lite /usr/local/include/iridrivers/lidar_lite)
+FIND_PATH(lidar_lite_INCLUDE_DIR lidar_lite.h exceptions.h lidar_lite_exceptions.h /usr/local/include/iri/lidar_lite /usr/include/iri/lidar_lite)
FIND_LIBRARY(lidar_lite_LIBRARY
NAMES lidar_lite
- PATHS /usr/lib /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers)
+ PATHS /usr/local/lib/iri/lidar_lite /usr/lib/iri/lidar_lite)
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 f744952..6c9a851 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,10 +41,10 @@ endif()
INSTALL(TARGETS lidar_lite
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib/iridrivers
- ARCHIVE DESTINATION lib/iridrivers
+ LIBRARY DESTINATION lib/iri/${PROJECT_NAME}
+ ARCHIVE DESTINATION lib/iri/${PROJECT_NAME}
)
-INSTALL(FILES ${headers} DESTINATION include/iridrivers/${PROJECT_NAME})
+INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
INSTALL(FILES ../Findlidar_lite.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
# Restart UDEV to account for new rules.d
--
GitLab