From 30e879ade86b6274cb4472fc77ddc82b0a38674d Mon Sep 17 00:00:00 2001
From: Alejandro Lopez Gestoso <alopez@iri.upc.edu>
Date: Thu, 30 May 2019 15:45:00 +0200
Subject: [PATCH] Adapted to the new installation directories
---
Finddynamixel_pan_tilt.cmake | 4 ++--
src/CMakeLists.txt | 6 +++---
src/xml/CMakeLists.txt | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Finddynamixel_pan_tilt.cmake b/Finddynamixel_pan_tilt.cmake
index 1cacb48..f174e90 100644
--- a/Finddynamixel_pan_tilt.cmake
+++ b/Finddynamixel_pan_tilt.cmake
@@ -1,9 +1,9 @@
#edit the following line to add the librarie's header files
-FIND_PATH(dynamixel_pan_tilt_INCLUDE_DIR dynamixel_pan_tilt.h dynamixel_pan_tilt_exceptions.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(dynamixel_pan_tilt_INCLUDE_DIR dynamixel_pan_tilt.h dynamixel_pan_tilt_exceptions.h /usr/local/include/iridrivers /usr/local/include/iri/dynamixel_pan_tilt /usr/include/iri/dynamixel_pan_tilt)
FIND_LIBRARY(dynamixel_pan_tilt_LIBRARY
NAMES dynamixel_pan_tilt
- PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers)
+ PATHS /usr/local/lib/iridrivers /usr/local/lib/iri/dynamixel_pan_tilt /usr/lib/iri/dynamixel_pan_tilt)
IF (dynamixel_pan_tilt_INCLUDE_DIR AND dynamixel_pan_tilt_LIBRARY)
SET(dynamixel_pan_tilt_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93c9bee..5bfdcb3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -30,10 +30,10 @@ ADD_DEPENDENCIES(dynamixel_pan_tilt xsd_files_gen)
INSTALL(TARGETS dynamixel_pan_tilt
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)
+INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
INSTALL(FILES ../Finddynamixel_pan_tilt.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index e34fbe7..2a16970 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -40,7 +40,7 @@ IF(XSD_FOUND)
DEPENDS ${XSD_PATH_FILES}
COMMENT "Parsing the xml template file ${XSD_FILES}")
- INSTALL(FILES ${XSD_PATH_FILES} DESTINATION include/iridrivers/xml)
- INSTALL(FILES ${XSD_HEADERS_INT} DESTINATION include/iridrivers/xml)
+ INSTALL(FILES ${XSD_PATH_FILES} DESTINATION include/iri/${PROJECT_NAME}/xml)
+ INSTALL(FILES ${XSD_HEADERS_INT} DESTINATION include/iri/${PROJECT_NAME}/xml)
ENDIF(XSD_FILES)
ENDIF(XSD_FOUND)
--
GitLab