Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
pinocchio
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
Stack Of Tasks
pinocchio
Commits
22deb83d
Unverified
Commit
22deb83d
authored
5 years ago
by
Justin Carpentier
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1080 from jcarpent/devel
Update CMake Python policy
parents
147b378e
1ec90d95
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.github/workflows/ccpp.yml
+1
-1
1 addition, 1 deletion
.github/workflows/ccpp.yml
cmake
+1
-1
1 addition, 1 deletion
cmake
travis_custom/custom_build
+0
-3
0 additions, 3 deletions
travis_custom/custom_build
with
2 additions
and
5 deletions
.github/workflows/ccpp.yml
+
1
−
1
View file @
22deb83d
...
...
@@ -34,7 +34,7 @@ jobs:
export MAKEFLAGS="-j2"
mkdir build
cd build
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COLLISION_SUPPORT=ON
-DPYTHON_EXECUTABLE=$(which python2)
-DBUILD_ADVANCED_TESTING=ON
cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_WITH_COLLISION_SUPPORT=ON -DBUILD_ADVANCED_TESTING=ON
make
make build_tests
export CTEST_OUTPUT_ON_FAILURE=1
...
...
This diff is collapsed.
Click to expand it.
cmake
@
31f4a95e
Compare
61344038
...
31f4a95e
Subproject commit
61344038b1352d5a8de1e20db710c83be805d2eb
Subproject commit
31f4a95eec3cc5fc63e37c5af3eb352b86c29293
This diff is collapsed.
Click to expand it.
travis_custom/custom_build
+
0
−
3
View file @
22deb83d
...
...
@@ -5,11 +5,8 @@ set -e
set
-x
set
-v
# Setup environment variables.
if
[[
$TRAVIS_PYTHON_VERSION
-gt
30
]]
;
then
export
CMAKE_ADDITIONAL_OPTIONS
=
"
${
CMAKE_ADDITIONAL_OPTIONS
}
-DPYTHON_EXECUTABLE=
$(
which python3
)
"
else
export
CMAKE_ADDITIONAL_OPTIONS
=
"
${
CMAKE_ADDITIONAL_OPTIONS
}
-DPYTHON_EXECUTABLE=
$(
which python2
)
"
fi
export
CMAKE_ADDITIONAL_OPTIONS
=
"
${
CMAKE_ADDITIONAL_OPTIONS
}
-DBUILD_BENCHMARK=
\"
ON
\"
-DBUILD_TESTING=
\"
ON
\"
-DCMAKE_CXX_FLAGS=-DBOOST_SYSTEM_NO_DEPRECATED"
...
...
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