From 8c00afa162800e4306930bb318e0f077d0896881 Mon Sep 17 00:00:00 2001
From: Alejandro Lopez Gestoso <alopez@iri.upc.edu>
Date: Tue, 26 Feb 2019 11:27:40 +0100
Subject: [PATCH] Modified the necessary files to save the headers, the library
and all the related files on the subdirectory iri/<package_name>
---
Findtrajectory.cmake | 4 ++--
src/CMakeLists.txt | 6 +++---
src/xml/CMakeLists.txt | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Findtrajectory.cmake b/Findtrajectory.cmake
index 71343fa..23bcb87 100644
--- a/Findtrajectory.cmake
+++ b/Findtrajectory.cmake
@@ -1,9 +1,9 @@
#edit the following line to add the librarie's header files
-FIND_PATH(trajectory_INCLUDE_DIR trajectory.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(trajectory_INCLUDE_DIR trajectory.h /usr/include/iri/trajectory /usr/local/include/iri/trajectory)
FIND_LIBRARY(trajectory_LIBRARY
NAMES trajectory
- PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers)
+ PATHS /usr/lib/iri/trajectory /usr/local/lib /usr/local/lib/iri/trajectory)
IF (trajectory_INCLUDE_DIR AND trajectory_LIBRARY)
SET(trajectory_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 29e4659..be93c4e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -23,8 +23,8 @@ ADD_DEPENDENCIES(trajectory xsd_files_gen)
INSTALL(TARGETS trajectory
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib/iridrivers
- ARCHIVE DESTINATION lib/iridrivers)
-INSTALL(FILES ${headers} DESTINATION include/iridrivers)
+ LIBRARY DESTINATION lib/iri/${PROJECT_NAME}
+ ARCHIVE DESTINATION lib/iri/${PROJECT_NAME})
+INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
INSTALL(FILES ../Findtrajectory.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
ADD_SUBDIRECTORY(examples)
diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt
index 49639f0..e571ce2 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