From 963a49250c79d389b9f49b0e2bc12f7ae3360d03 Mon Sep 17 00:00:00 2001 From: Mederic Fourmy <mederic.fourmy@gmail.com> Date: Mon, 16 May 2022 13:27:46 +0200 Subject: [PATCH] [skip-ci] cleaning things --- CMakeLists.txt | 4 +++- src/CMakeLists.txt | 39 --------------------------------------- 2 files changed, 3 insertions(+), 40 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73a1846..aab2ea7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,6 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bin) SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/lib) set(INCLUDE_INSTALL_DIR include/iri-algorithms) set(LIB_INSTALL_DIR lib/) -# SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules") IF (NOT CMAKE_BUILD_TYPE) #SET(CMAKE_BUILD_TYPE "DEBUG") @@ -26,6 +25,9 @@ FIND_PACKAGE(falkolib QUIET) find_package(PkgConfig) pkg_check_modules(csm QUIET csm ) link_directories(${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") #Build tests diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8933958..06fe812 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,24 +2,8 @@ MESSAGE("Starting laser_scan_utils CMakeLists ...") CMAKE_MINIMUM_REQUIRED(VERSION 3.10) -#include directories INCLUDE_DIRECTORIES(.) -IF(csm_FOUND) - MESSAGE(STATUS "CSM lib found") - INCLUDE_DIRECTORIES(${csm_INCLUDE_DIRS}) -ENDIF(csm_FOUND) -IF(faramotics_FOUND) - MESSAGE(STATUS "FARAMOTICS lib found") - INCLUDE_DIRECTORIES(${faramotics_INCLUDE_DIRS}) -ENDIF(faramotics_FOUND) -IF(falkolib_FOUND) - MESSAGE(STATUS "FALKO lib found:") - add_definitions(-DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT) - INCLUDE_DIRECTORIES(${falkolib_INCLUDE_DIRS}) - LINK_DIRECTORIES(${falkolib_LIBRARY_DIRS}) -ENDIF(falkolib_FOUND) - #headers SET(HDRS_BASE laser_scan_utils.h) @@ -42,7 +26,6 @@ SET(HDRS scan_segment.h loop_closure_base.h scene_base.h - ) IF(csm_FOUND) SET(HDRS ${HDRS} @@ -86,28 +69,9 @@ SET(SRCS ENDIF(falkolib_FOUND) - # create the shared library ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS}) 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} PUBLIC ${csm_LIBRARIES}) @@ -137,6 +101,3 @@ INSTALL(FILES ${HDRS_BASE} DESTINATION include/iri-algorithms/laser_scan_utils) INSTALL(FILES ${HDRS} DESTINATION include/iri-algorithms/laser_scan_utils) - -# #install Find*.cmake -# INSTALL(FILES ../Findlaser_scan_utils.cmake DESTINATION ${CMAKE_ROOT}/Modules/) -- GitLab