From d4e6048ee71cdb62ee759f29d6ceafe2c9c3d954 Mon Sep 17 00:00:00 2001
From: Alopez <alopez@iri.upc.edu>
Date: Tue, 2 Jul 2019 16:50:21 +0200
Subject: [PATCH] Adapted to CMake plural variables *_DIRS and *_LIBRARIES
---
Findbno055_imu_driver.cmake | 27 ++++++++++++++++-----------
src/CMakeLists.txt | 12 ++++++------
2 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/Findbno055_imu_driver.cmake b/Findbno055_imu_driver.cmake
index cd0f15d..b15b8b7 100644
--- a/Findbno055_imu_driver.cmake
+++ b/Findbno055_imu_driver.cmake
@@ -1,27 +1,32 @@
#edit the following line to add the librarie's header files
-FIND_PATH(bno055_imu_driver_INCLUDE_DIR bno055_imu_driver.h bno055_imu_exceptions.h bno055_common.h bno055_imu_sim.h /usr/local/include/iri/bno055_imu /usr/include/iri/bno055_imu)
+FIND_PATH(bno055_imu_driver_INCLUDE_DIRS bno055_imu_driver.h bno055_imu_exceptions.h bno055_common.h bno055_imu_sim.h /usr/local/include/iri/bno055_imu /usr/include/iri/bno055_imu)
-FIND_LIBRARY(bno055_imu_driver_LIBRARY_aux
+FIND_LIBRARY(bno055_imu_driver_LIBRARIES_aux
NAMES bno055_imu_driver
PATHS /usr/local/lib/iri/bno055_imu /usr/lib/iri/bno055_imu)
-FIND_LIBRARY(bno055_imu_sim_LIBRARY_aux
+FIND_LIBRARY(bno055_imu_sim_LIBRARIES_aux
NAMES bno055_imu_sim
PATHS /usr/local/lib/iri/bno055_imu /usr/lib/iri/bno055_imu)
-IF (bno055_imu_driver_LIBRARY_aux AND bno055_imu_sim_LIBRARY_aux)
- SET(bno055_imu_driver_LIBRARY ${bno055_imu_driver_LIBRARY_aux} ${bno055_imu_sim_LIBRARY_aux})
-ELSE (bno055_imu_driver_LIBRARY_aux AND bno055_imu_sim_LIBRARY_aux)
- MESSAGE(FATAL_ERROR "Could not find bn055_imu_driver ${bno055_imu_driver_LIBRARY_aux} or bno055_imu_sim ${bno055_imu_sim_LIBRARY_aux}")
-ENDIF (bno055_imu_driver_LIBRARY_aux AND bno055_imu_sim_LIBRARY_aux)
+IF (bno055_imu_driver_LIBRARIES_aux AND bno055_imu_sim_LIBRARIES_aux)
+ SET(bno055_imu_driver_LIBRARIES ${bno055_imu_driver_LIBRARIES_aux} ${bno055_imu_sim_LIBRARIES_aux})
+ELSE (bno055_imu_driver_LIBRARIES_aux AND bno055_imu_sim_LIBRARIES_aux)
+ MESSAGE(FATAL_ERROR "Could not find bn055_imu_driver ${bno055_imu_driver_LIBRARIES_aux} or bno055_imu_sim ${bno055_imu_sim_LIBRARIES_aux}")
+ENDIF (bno055_imu_driver_LIBRARIES_aux AND bno055_imu_sim_LIBRARIES_aux)
-IF (bno055_imu_driver_INCLUDE_DIR AND bno055_imu_driver_LIBRARY)
+
+SET(bno055_imu_driver_INCLUDE_DIR ${bno055_imu_driver_INCLUDE_DIRS})
+SET(bno055_imu_driver_LIBRARY ${bno055_imu_driver_LIBRARIES})
+
+
+IF (bno055_imu_driver_INCLUDE_DIRS AND bno055_imu_driver_LIBRARIES)
SET(bno055_imu_driver_FOUND TRUE)
-ENDIF (bno055_imu_driver_INCLUDE_DIR AND bno055_imu_driver_LIBRARY)
+ENDIF (bno055_imu_driver_INCLUDE_DIRS AND bno055_imu_driver_LIBRARIES)
IF (bno055_imu_driver_FOUND)
IF (NOT bno055_imu_driver_FIND_QUIETLY)
- MESSAGE(STATUS "Found bno055_imu_driver: ${bno055_imu_driver_LIBRARY}")
+ MESSAGE(STATUS "Found bno055_imu_driver: ${bno055_imu_driver_LIBRARIES}")
ENDIF (NOT bno055_imu_driver_FIND_QUIETLY)
ELSE (bno055_imu_driver_FOUND)
IF (bno055_imu_driver_FIND_REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2a7c843..2df91fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,19 +11,19 @@ FIND_PACKAGE(iriutils REQUIRED)
FIND_PACKAGE(comm REQUIRED)
# add the necessary include directories
INCLUDE_DIRECTORIES(../include)
-INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR})
-INCLUDE_DIRECTORIES(${comm_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${comm_INCLUDE_DIRS})
# create the shared library
ADD_LIBRARY(bno055_imu_driver SHARED ${sources})
# link necessary libraries
-TARGET_LINK_LIBRARIES(bno055_imu_driver ${iriutils_LIBRARY})
-TARGET_LINK_LIBRARIES(bno055_imu_driver ${comm_LIBRARY})
+TARGET_LINK_LIBRARIES(bno055_imu_driver ${iriutils_LIBRARIES})
+TARGET_LINK_LIBRARIES(bno055_imu_driver ${comm_LIBRARIES})
# create the shared library
ADD_LIBRARY(bno055_imu_sim SHARED ${sources_sim})
# link necessary libraries
-TARGET_LINK_LIBRARIES(bno055_imu_sim ${iriutils_LIBRARY})
-TARGET_LINK_LIBRARIES(bno055_imu_sim ${comm_LIBRARY})
+TARGET_LINK_LIBRARIES(bno055_imu_sim ${iriutils_LIBRARIES})
+TARGET_LINK_LIBRARIES(bno055_imu_sim ${comm_LIBRARIES})
INSTALL(TARGETS bno055_imu_driver
RUNTIME DESTINATION bin
--
GitLab