From e25a07e828cbde4db72a265008c4f576d8714f24 Mon Sep 17 00:00:00 2001 From: Alopez <alopez@iri.upc.edu> Date: Fri, 30 Aug 2019 13:01:42 +0200 Subject: [PATCH] Adapted to CMake plural variables *_DIRS and *_LIBRARIES --- src/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ac56995..31cd484 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -40,16 +40,16 @@ ENDIF (raw1394_INCLUDE_DIRS AND raw1394_LIBRARIES AND dc1394_INCLUDE_DIRS AND dc IF (firewire_camera_ready) MESSAGE(STATUS "The system is libdc 2.0 capable") # add all the necessary include directories (project_name_INDLUDE_DIR) - INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR} ${dc1394_INCLUDE_DIRS} ${raw1394_INCLUDE_DIRS} ../include/) + INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIRS} ${dc1394_INCLUDE_DIRS} ${raw1394_INCLUDE_DIRS} ../include/) ADD_LIBRARY(firewire_camera SHARED ${sources}) #if CV then add the libraries if (USE_CV) - TARGET_LINK_LIBRARIES(firewire_camera ${OpenCV_LIBS} ${iriutils_LIBRARY} ${dc1394_LIBRARIES} ${raw1394_LIBRARIES}) + TARGET_LINK_LIBRARIES(firewire_camera ${OpenCV_LIBS} ${iriutils_LIBRARIES} ${dc1394_LIBRARIES} ${raw1394_LIBRARIES}) INCLUDE_DIRECTORIES(${OpenCV_INCLUDE_DIRS}) else(USE_CV) - TARGET_LINK_LIBRARIES(firewire_camera ${iriutils_LIBRARY} ${dc1394_LIBRARIES} ${raw1394_LIBRARIES}) + TARGET_LINK_LIBRARIES(firewire_camera ${iriutils_LIBRARIES} ${dc1394_LIBRARIES} ${raw1394_LIBRARIES}) endif(USE_CV) INSTALL(TARGETS firewire_camera -- GitLab