Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
hpp-fcl
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
Guilhem Saurel
hpp-fcl
Commits
6812e356
Unverified
Commit
6812e356
authored
5 years ago
by
Justin Carpentier
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #132 from jcarpent/devel
Fix packaging bug
parents
22f98db0
9371d9bd
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis.yml
+17
-1
17 additions, 1 deletion
.travis.yml
CMakeLists.txt
+2
-4
2 additions, 4 deletions
CMakeLists.txt
with
19 additions
and
5 deletions
.travis.yml
+
17
−
1
View file @
6812e356
...
...
@@ -6,6 +6,7 @@ env:
-
CTEST_OUTPUT_ON_FAILURE=1
-
CXX_FLAGS_DEBUG="-O1"
-
MAKEFLAGS="-j2"
-
BUILD_TESTING=ON
cache
:
ccache
:
true
...
...
@@ -71,6 +72,21 @@ matrix:
-
python-lxml
-
python3-lxml
-
name
:
"
Bionic
-
Release
-
g++
-
NO
TEST"
env
:
-
BUILD_TYPE=Release
-
BUILD_TESTING=OFF
dist
:
bionic
compiler
:
g++
addons
:
apt
:
packages
:
-
cmake
-
libboost-all-dev
-
libassimp-dev
-
libeigen3-dev
-
liboctomap-dev
-
name
:
"
OSX
-
Release
-
clang"
env
:
BUILD_TYPE=Release
os
:
osx
...
...
@@ -91,7 +107,7 @@ script:
-
cd build
# Configure
-
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-w -DCMAKE_CXX_FLAGS_DEBUG=${CXX_FLAGS_DEBUG} -DPYTHON_EXECUTABLE=$(which python) ..
-
cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE
-DBUILD_TESTING=$BUILD_TESTING
-DCMAKE_CXX_FLAGS=-w -DCMAKE_CXX_FLAGS_DEBUG=${CXX_FLAGS_DEBUG} -DPYTHON_EXECUTABLE=$(which python) ..
# Build
-
make
...
...
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
2
−
4
View file @
6812e356
...
...
@@ -81,9 +81,7 @@ set (BUILD_TESTING TRUE CACHE BOOL "compile and run unit tests")
# Required dependencies
set
(
BOOST_COMPONENTS thread date_time system
)
if
(
BUILD_TESTING
)
set
(
BOOST_COMPONENTS
${
BOOST_COMPONENTS
}
filesystem unit_test_framework chrono
)
endif
()
set
(
BOOST_COMPONENTS
${
BOOST_COMPONENTS
}
filesystem unit_test_framework chrono
)
if
(
BUILD_PYTHON_INTERFACE
)
FINDPYTHON
()
set
(
BOOST_COMPONENTS
${
BOOST_COMPONENTS
}
python
)
...
...
@@ -161,7 +159,7 @@ endif ()
add_subdirectory
(
test
)
pkg_config_append_libs
(
"hpp-fcl"
)
PKG_CONFIG_APPEND_BOOST_LIBS
(
thread date_time
filesystem
system
)
PKG_CONFIG_APPEND_BOOST_LIBS
(
thread date_time system
)
IF
(
HPP_FCL_HAVE_OCTOMAP
)
# FCL_HAVE_OCTOMAP kept for backward compatibility reasons.
PKG_CONFIG_APPEND_CFLAGS
(
...
...
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