AuroraMiddleware/glm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjust CI to use the newly generated config files

Browse Source
This commit is contained in:
Krzysztof Kurek 2021-01-31 16:13:05 +01:00
parent 3a4b55020e
commit 887827b762
No known key found for this signature in database
GPG Key ID: 04CCC8030ECE248C
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.appveyor.yml
View File

@ -74,10 +74,11 @@ before_build:
$env:generator="$env:generator Win64" $env:generator="$env:generator Win64"
} }
echo generator="$env:generator" echo generator="$env:generator"
cmake .. -G "$env:generator" -DGLM_QUIET=ON -DGLM_TEST_ENABLE=ON "$env:GLM_ARGUMENTS" cmake .. -G "$env:generator" -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/install" -DGLM_QUIET=ON -DGLM_TEST_ENABLE=ON "$env:GLM_ARGUMENTS"
build_script: build_script:
- cmake --build . --parallel --config %CONFIGURATION% -- /m /v:minimal - cmake --build . --parallel --config %CONFIGURATION% -- /m /v:minimal
- cmake --build . --target install --parallel --config %CONFIGURATION% -- /m /v:minimal
test_script: test_script:
- ctest --parallel 4 --verbose -C %CONFIGURATION% - ctest --parallel 4 --verbose -C %CONFIGURATION%
@ -85,7 +86,7 @@ test_script:
- ps: | - ps: |
mkdir build_test_cmake mkdir build_test_cmake
cd build_test_cmake cd build_test_cmake
cmake ..\test\cmake\ -G "$env:generator" -Dglm_DIR="$env:APPVEYOR_BUILD_FOLDER/cmake/glm/" cmake ..\test\cmake\ -G "$env:generator" -DCMAKE_PREFIX_PATH="$env:APPVEYOR_BUILD_FOLDER/install"
- cmake --build . --parallel --config %CONFIGURATION% -- /m /v:minimal - cmake --build . --parallel --config %CONFIGURATION% -- /m /v:minimal
deploy: off deploy: off

5
.travis.yml
View File

@ -415,13 +415,14 @@ before_script:
script: script:
- mkdir ./build - mkdir ./build
- cd ./build - cd ./build
- cmake -DCMAKE_CXX_COMPILER=$COMPILER ${CMAKE_BUILD_ENV} .. - cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/install -DCMAKE_CXX_COMPILER=$COMPILER ${CMAKE_BUILD_ENV} ..
- cmake --build . ${CMAKE_ENV} - cmake --build . ${CMAKE_ENV}
- ctest ${CTEST_ENV} - ctest ${CTEST_ENV}
- cmake --build . --target install ${CMAKE_ENV}
- cd $TRAVIS_BUILD_DIR - cd $TRAVIS_BUILD_DIR
- mkdir ./build_test_cmake - mkdir ./build_test_cmake
- cd ./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 -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/install
- cmake --build . - cmake --build .