Skip to content
Snippets Groups Projects
Unverified Commit 22deb83d authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
Browse files

Merge pull request #1080 from jcarpent/devel

Update CMake Python policy
parents 147b378e 1ec90d95
Branches
Tags
No related merge requests found
......@@ -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
......
Subproject commit 61344038b1352d5a8de1e20db710c83be805d2eb
Subproject commit 31f4a95eec3cc5fc63e37c5af3eb352b86c29293
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment