From e90d308c5668a9d636c5866d8e52e146a112f39e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Vallv=C3=A9=20Navarro?= <jvallve@iri.upc.edu> Date: Tue, 17 May 2022 11:30:57 +0200 Subject: [PATCH] changed list filter by string replace --- CMakeLists.txt | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 23d263d..cdda9cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,11 +28,12 @@ link_directories(${csm_LIBRARY_DIRS}) message(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 -SET(csm_LIBRARY_DIRS_LENGTH "0") -list(LENGTH csm_LIBRARY_DIRS csm_LIBRARY_DIRS_LENGTH ) -message("$csm_LIBRARY_DIRS_LENGTH") -list(FILTER csm_LIBRARY_DIRS EXCLUDE REGEX ".") +string(REPLACE "./" "/" csm_LIBRARY_DIRS ${csm_LIBRARY_DIRS}) +# SET(csm_LIBRARY_DIRS_LENGTH "0") +# list(LENGTH csm_LIBRARY_DIRS csm_LIBRARY_DIRS_LENGTH ) message(csm_LIBRARY_DIRS: ${csm_LIBRARY_DIRS}) +# list(FILTER csm_LIBRARY_DIRS EXCLUDE REGEX ".") +# message(csm_LIBRARY_DIRS: ${csm_LIBRARY_DIRS}) #Build tests @@ -191,8 +192,12 @@ install( # Specifies include directories to use when compiling the plugin target # This way, include_directories does not need to be called in plugins depending on this one -target_include_directories(${PROJECT_NAME} INTERFACE - $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}> +# target_include_directories(${PROJECT_NAME} INTERFACE +# $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}> +# ) +target_include_directories(${PROJECT_NAME} PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/laser_scan_utils> + $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}> ) #Build tests -- GitLab