Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
laser_scan_utils
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
algorithms
laser_scan_utils
Commits
963a4925
Commit
963a4925
authored
3 years ago
by
Mederic Fourmy
Browse files
Options
Downloads
Patches
Plain Diff
[skip-ci] cleaning things
parent
40fedf04
No related branches found
No related tags found
2 merge requests
!8
Cmake refactoring was merged to main, merge back to devel also
,
!7
Resolve "Adapt to core CMakeLists.txt refactor"
Pipeline
#10834
skipped
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-1
3 additions, 1 deletion
CMakeLists.txt
src/CMakeLists.txt
+0
-39
0 additions, 39 deletions
src/CMakeLists.txt
with
3 additions
and
40 deletions
CMakeLists.txt
+
3
−
1
View file @
963a4925
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
0
−
39
View file @
963a4925
...
...
@@ -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/)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment