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
503ad0d6
Commit
503ad0d6
authored
3 years ago
by
Mederic Fourmy
Browse files
Options
Downloads
Patches
Plain Diff
[skip-ci] Fixing include and linking problem with csm and falkolib
parent
184734a1
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
#10635
skipped
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+1
-1
1 addition, 1 deletion
.gitignore
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
cmake_modules/laser_scan_utilsConfig.cmake.in
+2
-0
2 additions, 0 deletions
cmake_modules/laser_scan_utilsConfig.cmake.in
src/CMakeLists.txt
+10
-6
10 additions, 6 deletions
src/CMakeLists.txt
with
15 additions
and
8 deletions
.gitignore
+
1
−
1
View file @
503ad0d6
#Ignore build, bin and lib folders
bin/
build/
build
*
/
lib/
.settings/language.settings.xml
.project
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
2
−
1
View file @
503ad0d6
...
...
@@ -6,7 +6,7 @@ PROJECT(laser_scan_utils)
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
/wolf
)
set
(
INCLUDE_INSTALL_DIR include/iri-algorithms
)
set
(
LIB_INSTALL_DIR lib/
)
# SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules")
...
...
@@ -25,6 +25,7 @@ FIND_PACKAGE(Eigen3 3.3 REQUIRED)
FIND_PACKAGE
(
falkolib QUIET
)
find_package
(
PkgConfig
)
pkg_check_modules
(
csm QUIET csm
)
link_directories
(
${
csm_LIBRARY_DIRS
}
)
#Build tests
...
...
This diff is collapsed.
Click to expand it.
cmake_modules/laser_scan_utilsConfig.cmake.in
+
2
−
0
View file @
503ad0d6
...
...
@@ -3,6 +3,8 @@ 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")
...
...
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
10
−
6
View file @
503ad0d6
...
...
@@ -6,16 +6,15 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
INCLUDE_DIRECTORIES
(
.
)
IF
(
csm_FOUND
)
INCLUDE_DIRECTORIES
(
${
csm_INCLUDE_DIRS
}
)
MESSAGE
(
STATUS
"CSM lib found"
)
INCLUDE_DIRECTORIES
(
${
csm_INCLUDE_DIRS
}
)
ENDIF
(
csm_FOUND
)
IF
(
faramotics_FOUND
)
INCLUDE_DIRECTORIES
(
${
faramotics_INCLUDE_DIRS
}
)
MESSAGE
(
STATUS
"FARAMOTICS lib found"
)
INCLUDE_DIRECTORIES
(
${
faramotics_INCLUDE_DIRS
}
)
ENDIF
(
faramotics_FOUND
)
IF
(
falkolib_FOUND
)
MESSAGE
(
STATUS
"FALKO lib found:"
)
MESSAGE
(
STATUS
" falkolib_INCLUDE_DIRS
${
falkolib_INCLUDE_DIRS
}
"
)
MESSAGE
(
STATUS
" falkolib_LIBRARY_DIRS
${
falkolib_LIBRARY_DIRS
}
"
)
MESSAGE
(
STATUS
" falkolib_LIBRARIES
${
falkolib_LIBRARIES
}
"
)
add_definitions
(
-DEIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT
)
INCLUDE_DIRECTORIES
(
${
falkolib_INCLUDE_DIRS
}
)
LINK_DIRECTORIES
(
${
falkolib_LIBRARY_DIRS
}
)
...
...
@@ -91,8 +90,13 @@ 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})
IF
(
csm_FOUND
)
target_link_libraries
(
${
PROJECT_NAME
}
${
csm_LIBRAR
Y
}
)
target_link_libraries
(
${
PROJECT_NAME
}
${
csm_LIBRAR
IES
}
)
ENDIF
(
csm_FOUND
)
IF
(
falkolib_FOUND
)
...
...
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