From e0b1c79d0d5975817dd294d64f5ea44ee661ac50 Mon Sep 17 00:00:00 2001
From: Alopez <alopez@iri.upc.edu>
Date: Thu, 29 Aug 2019 12:21:01 +0200
Subject: [PATCH] Adapted to CMake plural variables *_DIRS and *_LIBRARIES
---
Findlidar_lite.cmake | 14 +++++++-------
src/CMakeLists.txt | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Findlidar_lite.cmake b/Findlidar_lite.cmake
index 214767a..1a9e537 100644
--- a/Findlidar_lite.cmake
+++ b/Findlidar_lite.cmake
@@ -1,20 +1,20 @@
#edit the following line to add the librarie's header files
-FIND_PATH(lidar_lite_INCLUDE_DIR lidar_lite.h exceptions.h lidar_lite_exceptions.h /usr/local/include/iri/lidar_lite /usr/include/iri/lidar_lite)
+FIND_PATH(lidar_lite_INCLUDE_DIRS lidar_lite.h exceptions.h lidar_lite_exceptions.h /usr/local/include/iri/lidar_lite /usr/include/iri/lidar_lite)
-FIND_LIBRARY(lidar_lite_LIBRARY
+FIND_LIBRARY(lidar_lite_LIBRARIES
NAMES lidar_lite
PATHS /usr/local/lib/iri/lidar_lite /usr/lib/iri/lidar_lite)
-SET(lidar_lite_INCLUDE_DIRS ${lidar_lite_INCLUDE_DIR})
-SET(lidar_lite_LIBRARIES ${lidar_lite_LIBRARY})
+SET(lidar_lite_INCLUDE_DIR ${lidar_lite_INCLUDE_DIRS})
+SET(lidar_lite_LIBRARY ${lidar_lite_LIBRARIES})
-IF (lidar_lite_INCLUDE_DIR AND lidar_lite_LIBRARY)
+IF (lidar_lite_INCLUDE_DIRS AND lidar_lite_LIBRARIES)
SET(lidar_lite_FOUND TRUE)
-ENDIF (lidar_lite_INCLUDE_DIR AND lidar_lite_LIBRARY)
+ENDIF (lidar_lite_INCLUDE_DIRS AND lidar_lite_LIBRARIES)
IF (lidar_lite_FOUND)
IF (NOT lidar_lite_FIND_QUIETLY)
- MESSAGE(STATUS "Found lidar_lite: ${lidar_lite_LIBRARY}")
+ MESSAGE(STATUS "Found lidar_lite: ${lidar_lite_LIBRARIES}")
ENDIF (NOT lidar_lite_FIND_QUIETLY)
ELSE (lidar_lite_FOUND)
IF (lidar_lite_FIND_REQUIRED)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c9a851..f5164f7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,18 +12,18 @@ FIND_PACKAGE(iriutils REQUIRED)
# add the necessary include directories
INCLUDE_DIRECTORIES(../include/)
INCLUDE_DIRECTORIES(../include/exceptions)
-INCLUDE_DIRECTORIES(${usb_i2c_adapter_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${usb_i2c_adapter_INCLUDE_DIRS})
INCLUDE_DIRECTORIES(${comm_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIRS})
# create the shared library
ADD_LIBRARY(lidar_lite SHARED ${sources})
# link necessary libraries
-TARGET_LINK_LIBRARIES(lidar_lite ${usb_i2c_adapter_LIBRARY})
-TARGET_LINK_LIBRARIES(lidar_lite ${comm_LIBRARY})
-TARGET_LINK_LIBRARIES(lidar_lite ${iriutils_LIBRARY})
+TARGET_LINK_LIBRARIES(lidar_lite ${usb_i2c_adapter_LIBRARIES})
+TARGET_LINK_LIBRARIES(lidar_lite ${comm_LIBRARIES})
+TARGET_LINK_LIBRARIES(lidar_lite ${iriutils_LIBRARIES})
# Check G++ compiler version
include(CheckCXXCompilerFlag)
--
GitLab