From 40fedf04d19a72820ecc10f375f46530f57c542b Mon Sep 17 00:00:00 2001 From: Mederic Fourmy <mederic.fourmy@gmail.com> Date: Mon, 16 May 2022 13:18:57 +0200 Subject: [PATCH] Added include and link directories to the laser_scan_utils target --- cmake_modules/laser_scan_utilsConfig.cmake.in | 2 -- src/CMakeLists.txt | 31 ++++++++++++++----- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/cmake_modules/laser_scan_utilsConfig.cmake.in b/cmake_modules/laser_scan_utilsConfig.cmake.in index 621f1e5..699253a 100644 --- a/cmake_modules/laser_scan_utilsConfig.cmake.in +++ b/cmake_modules/laser_scan_utilsConfig.cmake.in @@ -3,8 +3,6 @@ set(@PROJECT_NAME@_VERSION 0.0.1) @PACKAGE_INIT@ -FIND_DEPENDENCY(falkolib REQUIRED) -# FIND_DEPENDENCY(csm REQUIRED) # does not work! include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f76436e..8933958 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -89,18 +89,35 @@ SET(SRCS # create the shared library ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) -target_link_libraries(${PROJECT_NAME} Eigen3::Eigen) -# message(WARNING "csm_INCLUDE_DIRS: " ${csm_INCLUDE_DIRS}) -# message(WARNING "csm_LIBRARY: " ${csm_LIBRARY}) -# message(WARNING "csm_LIBRARIES: " ${csm_LIBRARIES}) -# message(WARNING "csm_LIBRARY_DIRS: " ${csm_LIBRARY_DIRS}) +target_link_libraries(${PROJECT_NAME} PUBLIC Eigen3::Eigen) +message(WARNING "csm_INCLUDE_DIRS: " ${csm_INCLUDE_DIRS}) +message(WARNING "csm_LIBRARY: " ${csm_LIBRARY}) +message(WARNING "csm_LIBRARIES: " ${csm_LIBRARIES}) +message(WARNING "csm_LIBRARY_DIRS: " ${csm_LIBRARY_DIRS}) +#Â keep only the files in a lib folder: by default the "." is in csm_LIBRARY_DIRS, +# which is not acceptable for target_link_directories +list(FILTER csm_LIBRARY_DIRS INCLUDE REGEX "/lib") +message(WARNING "csm_LIBRARY_DIRS: " ${csm_LIBRARY_DIRS}) +message(WARNING "falkolib_INCLUDE_DIRS: " ${falkolib_INCLUDE_DIRS}) +message(WARNING "falkolib_LIBRARY: " ${falkolib_LIBRARY}) +message(WARNING "falkolib_LIBRARIES: " ${falkolib_LIBRARIES}) +message(WARNING "falkolib_LIBRARY_DIRS: " ${falkolib_LIBRARY_DIRS}) + + +message("TOTO csm_LIBRARY_DIRS") +foreach(titi ${csm_LIBRARY_DIRS}) + message("${titi}") +endforeach() IF(csm_FOUND) - target_link_libraries(${PROJECT_NAME} ${csm_LIBRARIES}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${csm_LIBRARIES}) + target_include_directories(${PROJECT_NAME} PUBLIC ${csm_INCLUDE_DIRS}) + target_link_directories(${PROJECT_NAME} PUBLIC ${csm_LIBRARY_DIRS}) ENDIF(csm_FOUND) IF(falkolib_FOUND) - target_link_libraries(${PROJECT_NAME} ${falkolib_LIBRARY}) + target_link_libraries(${PROJECT_NAME} PUBLIC ${falkolib_LIBRARIES}) + target_include_directories(${PROJECT_NAME} PUBLIC ${falkolib_INCLUDE_DIRS}) ENDIF(falkolib_FOUND) # Examples -- GitLab