From d75d5b11e2b012b8316dde5d9414d65c7c8cc871 Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Tue, 5 Mar 2019 12:06:42 +0100
Subject: [PATCH] Install to subfolder. Add plural cmake variables. Add
gitignore Modified the necessary files to save the headers, the library and
all the related files on the subdirectory iri/<package_name> Add plural
_INCLUDE_DIRS and _LIBRARIES find cmake variables. Add .gitignore file to
ignore bin, build and lib directories
---
.gitignore | 3 +++
Findbattery_monitor.cmake | 10 ++++++----
src/CMakeLists.txt | 6 +++---
3 files changed, 12 insertions(+), 7 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..638c8d2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+bin
+build
+lib
diff --git a/Findbattery_monitor.cmake b/Findbattery_monitor.cmake
index f6ca8dc..f9b3b19 100755
--- a/Findbattery_monitor.cmake
+++ b/Findbattery_monitor.cmake
@@ -1,9 +1,12 @@
#edit the following line to add the librarie's header files
-FIND_PATH(battery_monitor_INCLUDE_DIR battery_monitor.h /usr/include/iridrivers /usr/local/include/iridrivers)
+FIND_PATH(battery_monitor_INCLUDE_DIR battery_monitor.h /usr/include/iri/battery_monitor /usr/local/include/iri/battery_monitor)
FIND_LIBRARY(battery_monitor_LIBRARY
NAMES battery_monitor
- PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers)
+ PATHS /usr/lib /usr/local/lib /usr/local/lib/iri/battery_monitor)
+
+SET(battery_monitor_INCLUDE_DIRS ${battery_monitor_INCLUDE_DIR})
+SET(battery_monitor_LIBRARIES ${battery_monitor_LIBRARY})
IF (battery_monitor_INCLUDE_DIR AND battery_monitor_LIBRARY)
SET(battery_monitor_FOUND TRUE)
@@ -17,5 +20,4 @@ ELSE (battery_monitor_FOUND)
IF (battery_monitor_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find battery_monitor")
ENDIF (battery_monitor_FIND_REQUIRED)
-ENDIF (battery_monitor_FOUND)
-
+ENDIF (battery_monitor_FOUND)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bee6963..2f4fb50 100755
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -24,8 +24,8 @@ TARGET_LINK_LIBRARIES(battery_monitor ${dynamixel_LIBRARY})
# link necessary libraries
INSTALL(TARGETS battery_monitor
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 ../Findbattery_monitor.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
ADD_SUBDIRECTORY(examples)
--
GitLab