From 9dadb5177017d24a9b15b6a4c339f8631a7345cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu>
Date: Fri, 26 Nov 2021 19:18:05 +0100
Subject: [PATCH] Resolve "remove `vision_utils/` from the path found by
Findvision_utils"
---
ReadMe.md | 4 ++--
cmake_modules/Findvision_utils.cmake | 7 ++++++-
src/CMakeLists.txt | 4 ++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ReadMe.md b/ReadMe.md
index 7d3a487..1d6292e 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -96,8 +96,8 @@ To do that, execute
make install
```
-as root and the shared libraries will be copied to `/usr/local/lib/<vision_utils>` directory
-and the header files will be copied to `/usr/local/include/<vision_utils>` directory. At
+as root and the shared libraries will be copied to `/usr/local/lib` directory
+and the header files will be copied to `/usr/local/include/vision_utils` directory. At
this point, the library may be used by any user.
To remove the library from the system, exceute
diff --git a/cmake_modules/Findvision_utils.cmake b/cmake_modules/Findvision_utils.cmake
index b6e7511..cda1ae4 100644
--- a/cmake_modules/Findvision_utils.cmake
+++ b/cmake_modules/Findvision_utils.cmake
@@ -1,12 +1,17 @@
#edit the following line to add the librarie's header files
FIND_PATH(vision_utils_INCLUDE_DIR vision_utils.h /usr/include/vision_utils /usr/local/include/vision_utils)
+#change INCLUDE_DIRS to its parent directory
+get_filename_component(vision_utils_INCLUDE_DIR ${vision_utils_INCLUDE_DIR} DIRECTORY)
+
FIND_LIBRARY(vision_utils_LIBRARY
NAMES vision_utils
- PATHS /usr/lib /usr/local/lib /usr/local/lib/vision_utils)
+ PATHS /usr/lib /usr/local/lib)
IF (vision_utils_INCLUDE_DIR AND vision_utils_LIBRARY)
SET(vision_utils_FOUND TRUE)
+ SET(vision_utils_INCLUDE_DIRS ${vision_utils_INCLUDE_DIR})
+ SET(vision_utils_LIBRARIES ${vision_utils_LIBRARY})
ENDIF (vision_utils_INCLUDE_DIR AND vision_utils_LIBRARY)
IF (vision_utils_FOUND)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 63a5d53..fec7f68 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -266,8 +266,8 @@ ENDIF (YAMLCPP_FOUND)
# install
INSTALL(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib/${PROJECT_NAME}
- ARCHIVE DESTINATION lib/${PROJECT_NAME})
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib)
INSTALL(FILES ${headers_main} DESTINATION include/${PROJECT_NAME})
INSTALL(FILES ${headers_com} DESTINATION include/${PROJECT_NAME}/common_class)
INSTALL(FILES ${headers_sen} DESTINATION include/${PROJECT_NAME}/sensors)
--
GitLab