diff --git a/Findlidar_lite.cmake b/Findlidar_lite.cmake index 214767a19bc1d5e736e91ce1303db57c174066c0..1a9e5376386cb0e1aef725bdd4c2116e1acef2bd 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 6c9a851057be5a28fecb53afb9bc9e8b4ac0b02c..f5164f7e464709763348300d03a2efc5bb1e1796 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)