Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
coal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
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
Coal
coal
Commits
4011a907
Unverified
Commit
4011a907
authored
5 years ago
by
Justin Carpentier
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #72 from jcarpent/devel
Sync submodule cmake and use SYSTEM option
parents
7532f7bb
e33ecee4
No related branches found
Branches containing commit
Tags
v1.1.2
Tags containing commit
No related merge requests found
Pipeline
#5127
passed with warnings
5 years ago
Stage: test
Changes
4
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
cmake
+1
-1
1 addition, 1 deletion
cmake
src/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/CMakeLists.txt
test/CMakeLists.txt
+1
-1
1 addition, 1 deletion
test/CMakeLists.txt
with
4 additions
and
4 deletions
CMakeLists.txt
+
1
−
1
View file @
4011a907
...
...
@@ -60,7 +60,7 @@ ENDIF(APPLE)
setup_hpp_project
()
add_required_dependency
(
"eigen3 >= 3.0.0"
)
include_directories
(
${
EIGEN3_INCLUDE_DIRS
}
)
include_directories
(
SYSTEM
${
EIGEN3_INCLUDE_DIRS
}
)
# Add a cache variable to allow not compiling and running tests
set
(
RUN_TESTS TRUE CACHE BOOL
"compile and run unit tests"
)
...
...
This diff is collapsed.
Click to expand it.
cmake
@
44155263
Compare
ecaf20c2
...
44155263
Subproject commit
ecaf20c28c8ce33de312fbd812f88037cf995b73
Subproject commit
441552634e4c427956be7b2834a6bbf894b24f0c
This diff is collapsed.
Click to expand it.
src/CMakeLists.txt
+
1
−
1
View file @
4011a907
...
...
@@ -83,7 +83,7 @@ set(${LIBRARY_NAME}_SOURCES
)
# Declare boost include directories
include_directories
(
${
Boost_INCLUDE_DIRS
}
)
include_directories
(
SYSTEM
${
Boost_INCLUDE_DIRS
}
)
link_directories
(
${
Boost_LIBRARY_DIRS
}
)
add_library
(
${
LIBRARY_NAME
}
...
...
This diff is collapsed.
Click to expand it.
test/CMakeLists.txt
+
1
−
1
View file @
4011a907
...
...
@@ -18,7 +18,7 @@ macro(add_fcl_test test_name)
endmacro
(
add_fcl_test
)
include_directories
(
${
CMAKE_CURRENT_BINARY_DIR
}
)
include_directories
(
${
Boost_INCLUDE_DIRS
}
)
include_directories
(
SYSTEM
${
Boost_INCLUDE_DIRS
}
)
add_fcl_test
(
test_fcl_math test_fcl_math.cpp
)
...
...
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