From 9fd3697e70f973a77d9687e7a00327ce44a6eec5 Mon Sep 17 00:00:00 2001
From: Alejandro Lopez Gestoso <alopez@iri.upc.edu>
Date: Tue, 26 Feb 2019 11:30:30 +0100
Subject: [PATCH] Modified the necessary files to save the headers, the library
and all the related files on the subdirectory iri/<package_name>
---
Findcomm.cmake | 4 ++--
src/CMakeLists.txt | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Findcomm.cmake b/Findcomm.cmake
index deab1a9..47100b9 100644
--- a/Findcomm.cmake
+++ b/Findcomm.cmake
@@ -1,9 +1,9 @@
-FIND_PATH(comm_INCLUDE_DIR comm.h commexceptions.h rs232.h rs232exceptions.h ftdiserver.h ftdimodule.h ftdiexcetpions.h socket.h socketclient.h socketserver.h socketexceptions.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(comm_INCLUDE_DIR comm.h commexceptions.h rs232.h rs232exceptions.h ftdiserver.h ftdimodule.h ftdiexcetpions.h socket.h socketclient.h socketserver.h socketexceptions.h /usr/include/iri/comm /usr/local/include/iri/comm)
FIND_LIBRARY(comm_LIBRARY
NAMES comm
- PATHS /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers)
+ PATHS /usr/lib/iri/comm /usr/local/lib /usr/local/lib/iri/comm)
IF (comm_INCLUDE_DIR AND comm_LIBRARY)
SET(comm_FOUND TRUE)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c717012..f8a0546 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -70,11 +70,11 @@ ENDIF(BUILD_FTDI)
INSTALL(TARGETS comm
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 ../Findcomm.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
--
GitLab