From 5f0baa29b95874944e6f30ce82728e2201a3656f Mon Sep 17 00:00:00 2001 From: Christophe Date: Tue, 24 Nov 2020 14:13:10 +0100 Subject: [PATCH] Fix build when CMake 2.6 is used not supporting --parallel --- .travis.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1bd7d715..8a50fbcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,13 @@ matrix: - mkdir ./build_unknown_release - cd ./build_unknown_release - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_DISABLE_AUTO_DETECTION=ON .. - - cmake --build . --parallel - - ctest --parallel 4 --output-on-failure + - cmake --build . + - ctest --output-on-failure - cd $TRAVIS_BUILD_DIR - mkdir ./build_test_cmake - cd ./build_test_cmake - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/ - - cmake --build . --parallel + - cmake --build . env: - MATRIX_EVAL="INFO=C++unknown-release" @@ -26,13 +26,13 @@ matrix: - mkdir ./build_pure_98_release - cd ./build_pure_98_release - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_FORCE_PURE=ON .. - - cmake --build . --parallel - - ctest --parallel 4 --output-on-failure + - cmake --build . + - ctest --output-on-failure - cd $TRAVIS_BUILD_DIR - mkdir ./build_test_cmake - cd ./build_test_cmake - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/ - - cmake --build . --parallel + - cmake --build . env: - MATRIX_EVAL="INFO=C++98-pure-release" @@ -43,13 +43,13 @@ matrix: - mkdir ./build_pure_ms_release - cd ./build_pure_ms_release - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_98=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON .. - - cmake --build . --parallel - - ctest --parallel 4 --output-on-failure + - cmake --build . + - ctest --output-on-failure - cd $TRAVIS_BUILD_DIR - mkdir ./build_test_cmake - cd ./build_test_cmake - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/ - - cmake --build . --parallel + - cmake --build . env: - MATRIX_EVAL="INFO=C++98-pure-ms-release" @@ -60,13 +60,13 @@ matrix: - mkdir ./build_pure_11_release - cd ./build_pure_11_release - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_FORCE_PURE=ON .. - - cmake --build . --parallel - - ctest --parallel 4 --output-on-failure + - cmake --build . + - ctest --output-on-failure - cd $TRAVIS_BUILD_DIR - mkdir ./build_test_cmake - cd ./build_test_cmake - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/ - - cmake --build . --parallel + - cmake --build . env: - MATRIX_EVAL="INFO=C++11-pure-release" @@ -77,13 +77,13 @@ matrix: - mkdir ./build_sse2_11_release - cd ./build_sse2_11_release - cmake -DCMAKE_CXX_COMPILER=$COMPILER -DCMAKE_BUILD_TYPE=Release -DGLM_TEST_ENABLE=ON -DGLM_TEST_ENABLE_CXX_11=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_SIMD_SSE2=ON .. - - cmake --build . --parallel - - ctest --parallel 4 --output-on-failure + - cmake --build . + - ctest --output-on-failure - cd $TRAVIS_BUILD_DIR - mkdir ./build_test_cmake - cd ./build_test_cmake - cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/ - - cmake --build . --parallel + - cmake --build . env: - MATRIX_EVAL="INFO=C++11-sse2-release"