From 2eb941d5b36b3dcd551b5e84fba60c1c0e6d71b2 Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Wed, 27 Mar 2019 17:39:55 +0100
Subject: [PATCH] Install path under /iri/mvbluefox3. Update find cmake
variables to plural _INCLUDE_DIRS, _LIBRARIES, but keeping singular ones
---
FindmvIMPACT.cmake | 15 +++++++++------
Findmvbluefox3.cmake | 15 +++++++++------
src/CMakeLists.txt | 10 +++++-----
3 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/FindmvIMPACT.cmake b/FindmvIMPACT.cmake
index f0bd3a5..b4d6757 100644
--- a/FindmvIMPACT.cmake
+++ b/FindmvIMPACT.cmake
@@ -1,16 +1,19 @@
#edit the following line to add the librarie's header files
-FIND_PATH(mvIMPACT_INCLUDE_DIR mvIMPACT_CPP/mvIMPACT_acquire.h /opt/mvIMPACT_Acquire)
+FIND_PATH(mvIMPACT_INCLUDE_DIRS mvIMPACT_CPP/mvIMPACT_acquire.h /opt/mvIMPACT_Acquire)
-FIND_LIBRARY(mvIMPACT_LIBRARY
+FIND_LIBRARY(mvIMPACT_LIBRARIES
NAMES mvDeviceManager
- PATHS /opt/mvIMPACT_Acquire/lib/x86_64)
+ PATHS /opt/mvIMPACT_Acquire/lib/x86_64)
-IF (mvIMPACT_INCLUDE_DIR AND mvIMPACT_LIBRARY)
+SET(mvIMPACT_INCLUDE_DIR ${mvIMPACT_INCLUDE_DIRS})
+SET(mvIMPACT_LIBRARY ${mvIMPACT_LIBRARIES})
+
+IF (mvIMPACT_INCLUDE_DIRS AND mvIMPACT_LIBRARIES)
SET(mvIMPACT_FOUND TRUE)
-ENDIF (mvIMPACT_INCLUDE_DIR AND mvIMPACT_LIBRARY)
+ENDIF (mvIMPACT_INCLUDE_DIRS AND mvIMPACT_LIBRARIES)
IF (mvIMPACT_FOUND)
- MESSAGE(STATUS "Found mvIMPACT: ${mvIMPACT_LIBRARY}")
+ MESSAGE(STATUS "Found mvIMPACT: ${mvIMPACT_LIBRARIES}")
ELSE (mvIMPACT_FOUND)
MESSAGE(FATAL_ERROR "Could not find mvIMPACT. Please install Matrix Vision drivers.")
ENDIF (mvIMPACT_FOUND)
diff --git a/Findmvbluefox3.cmake b/Findmvbluefox3.cmake
index 234178b..06a6fd0 100644
--- a/Findmvbluefox3.cmake
+++ b/Findmvbluefox3.cmake
@@ -1,17 +1,20 @@
#edit the following line to add the librarie's header files
-FIND_PATH(mvbluefox3_INCLUDE_DIR mvbluefox3.h /usr/include/iridrivers/mvbluefox3 /usr/local/include/iridrivers/mvbluefox3)
+FIND_PATH(mvbluefox3_INCLUDE_DIRS mvbluefox3.h /usr/include/iri/mvbluefox3 /usr/local/include/iri/mvbluefox3)
-FIND_LIBRARY(mvbluefox3_LIBRARY
+FIND_LIBRARY(mvbluefox3_LIBRARIES
NAMES mvbluefox3
- PATHS /usr/lib /usr/local/lib /usr/local/lib/iridrivers)
+ PATHS /usr/lib /usr/lib/mvbluefox3 /usr/local/lib /usr/local/lib/iri/mvbluefox3)
-IF (mvbluefox3_INCLUDE_DIR AND mvbluefox3_LIBRARY)
+SET(mvbluefox3_INCLUDE_DIR ${mvbluefox3_INCLUDE_DIRS})
+SET(mvbluefox3_LIBRARY ${mvbluefox3_LIBRARIES})
+
+IF (mvbluefox3_INCLUDE_DIRS AND mvbluefox3_LIBRARIES)
SET(mvbluefox3_FOUND TRUE)
-ENDIF (mvbluefox3_INCLUDE_DIR AND mvbluefox3_LIBRARY)
+ENDIF (mvbluefox3_INCLUDE_DIRS AND mvbluefox3_LIBRARIES)
IF (mvbluefox3_FOUND)
IF (NOT mvbluefox3_FIND_QUIETLY)
- MESSAGE(STATUS "Found mvbluefox3: ${mvbluefox3_LIBRARY}")
+ MESSAGE(STATUS "Found mvbluefox3: ${mvbluefox3_LIBRARIES}")
ENDIF (NOT mvbluefox3_FIND_QUIETLY)
ELSE (mvbluefox3_FOUND)
IF (mvbluefox3_FIND_REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c3aa182..2b46d01 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,11 +52,11 @@ endif(USE_CV)
# link necessary libraries
INSTALL(TARGETS mvbluefox3
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib/iridrivers
- ARCHIVE DESTINATION lib/iridrivers)
-INSTALL(FILES ${headers} DESTINATION include/iridrivers/mvbluefox3)
-INSTALL(FILES ${headers_ex} DESTINATION include/iridrivers/mvbluefox3/exceptions)
-INSTALL(FILES ${headers_mut} DESTINATION include/iridrivers/mvbluefox3/mutex)
+ LIBRARY DESTINATION lib/iri/${PROJECT_NAME}
+ ARCHIVE DESTINATION lib/iri/${PROJECT_NAME})
+INSTALL(FILES ${headers} DESTINATION include/iri/${PROJECT_NAME})
+INSTALL(FILES ${headers_ex} DESTINATION include/iri/${PROJECT_NAME}/exceptions)
+INSTALL(FILES ${headers_mut} DESTINATION include/iri/${PROJECT_NAME}/mutex)
INSTALL(FILES ../Findmvbluefox3.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
INSTALL(FILES ../FindmvIMPACT.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
--
GitLab