From 1fc50695c38461d618f58238be461b017742d543 Mon Sep 17 00:00:00 2001
From: Alejandro Lopez Gestoso <alopez@iri.upc.edu>
Date: Tue, 26 Feb 2019 11:33:34 +0100
Subject: [PATCH] Modified the necessary files to save the headers, the
library and all the related files on the subdirectory iri/<package_name>
---
Finddynamixel.cmake | 4 ++--
src/CMakeLists.txt | 6 +++---
src/xml/CMakeLists.txt | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Finddynamixel.cmake b/Finddynamixel.cmake
index 0a8f5c8..ffe38ff 100644
--- a/Finddynamixel.cmake
+++ b/Finddynamixel.cmake
@@ -1,9 +1,9 @@
#edit the following line to add the librarie's header files
-FIND_PATH(dynamixel_INCLUDE_DIR dynamixel.h dynamixelserver.h dynamixelexceptions.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(dynamixel_INCLUDE_DIR dynamixel.h dynamixelserver.h dynamixelexceptions.h /usr/include/iri/dynamixel /usr/local/include/iri/dynamixel)
FIND_LIBRARY(dynamixel_LIBRARY
NAMES dynamixel
- PATHS /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers)
+ PATHS /usr/lib/iri/dynamixel /usr/local/lib /usr/local/lib/iri/dynamixel)
IF (dynamixel_INCLUDE_DIR AND dynamixel_LIBRARY)
SET(dynamixel_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 95f8ba9..7b4a610 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,11 +31,11 @@ ADD_DEPENDENCIES(dynamixel xsd_files_gen)
INSTALL(TARGETS dynamixel
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.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 44ddee0..51b80dd 100644
--- a/src/xml/CMakeLists.txt
+++ b/src/xml/CMakeLists.txt
@@ -39,7 +39,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