diff --git a/.travis.yml b/.travis.yml index b34dd4f9ceb367fb0765e9ef07f3e9aad5a94c61..d75249e65a5971b7b9c333a4f9b182ff6f9ccb9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ env: - CTEST_PARALLEL_LEVEL=4 - CTEST_OUTPUT_ON_FAILURE=1 - CXX_FLAGS_DEBUG="-O1" - - BUILD_PYTHON_INTERFACE=ON - MAKEFLAGS="-j2" cache: @@ -79,11 +78,13 @@ before_install: script: # Create build directory + - which python + - which python2 - mkdir build - cd build # Configure - - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-w -DCMAKE_CXX_FLAGS_DEBUG=${CXX_FLAGS_DEBUG} -DBUILD_PYTHON_INTERFACE=${BUILD_PYTHON_INTERFACE} .. + - cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_CXX_FLAGS=-w -DCMAKE_CXX_FLAGS_DEBUG=${CXX_FLAGS_DEBUG} -DPYTHON_EXECUTABLE=$(which python2) .. # Build - make diff --git a/cmake b/cmake index a99dc925bde7b976ae1ed286d0ab38906c73dff5..790a17f08761ba53ed1152390f641f495711d979 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit a99dc925bde7b976ae1ed286d0ab38906c73dff5 +Subproject commit 790a17f08761ba53ed1152390f641f495711d979