From 471dbaca70b89dbfa1e78dab8cbf86b280cdcd22 Mon Sep 17 00:00:00 2001
From: Alejandro Lopez Gestoso <alopez@iri.upc.edu>
Date: Tue, 26 Feb 2019 11:23:53 +0100
Subject: [PATCH] Modified the necessaries files to save the headers, the
library and all the related files on the subdirectory iri/<package_name>
---
Findiriutils.cmake | 4 ++--
src/CMakeLists.txt | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Findiriutils.cmake b/Findiriutils.cmake
index 3d62f89..68c6ef0 100644
--- a/Findiriutils.cmake
+++ b/Findiriutils.cmake
@@ -1,8 +1,8 @@
-FIND_PATH(iriutils_INCLUDE_DIR exceptions.h mutex.h mutexexceptions.h event.h eventserver.h eventexceptions.h thread.h threadserver.h threadexceptions.h comm.h commexceptions.h log.h logexceptions.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(iriutils_INCLUDE_DIR exceptions.h mutex.h mutexexceptions.h event.h eventserver.h eventexceptions.h thread.h threadserver.h threadexceptions.h comm.h commexceptions.h log.h logexceptions.h /usr/include/iri/iriutils /usr/local/include/iri/iriutils)
FIND_LIBRARY(iriutils_LIBRARY
NAMES iriutils
- PATHS /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers)
+ PATHS /usr/lib/iri/iriutils /usr/local/lib /usr/local/lib/iri/iriutils)
IF (iriutils_INCLUDE_DIR AND iriutils_LIBRARY)
SET(iriutils_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d8b71c..d1be0c5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,11 +20,11 @@ ENDIF(APPLE)
INSTALL(TARGETS iriutils
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 ../Findiriutils.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
--
GitLab