Skip to content

Commit 887827b

Browse files
committed
Adjust CI to use the newly generated config files
1 parent 3a4b550 commit 887827b

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.appveyor.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,19 @@ before_build:
7474
$env:generator="$env:generator Win64"
7575
}
7676
echo generator="$env:generator"
77-
cmake .. -G "$env:generator" -DGLM_QUIET=ON -DGLM_TEST_ENABLE=ON "$env:GLM_ARGUMENTS"
77+
cmake .. -G "$env:generator" -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/install" -DGLM_QUIET=ON -DGLM_TEST_ENABLE=ON "$env:GLM_ARGUMENTS"
7878
7979
build_script:
8080
- cmake --build . --parallel --config %CONFIGURATION% -- /m /v:minimal
81+
- cmake --build . --target install --parallel --config %CONFIGURATION% -- /m /v:minimal
8182

8283
test_script:
8384
- ctest --parallel 4 --verbose -C %CONFIGURATION%
8485
- cd ..
8586
- ps: |
8687
mkdir build_test_cmake
8788
cd build_test_cmake
88-
cmake ..\test\cmake\ -G "$env:generator" -Dglm_DIR="$env:APPVEYOR_BUILD_FOLDER/cmake/glm/"
89+
cmake ..\test\cmake\ -G "$env:generator" -DCMAKE_PREFIX_PATH="$env:APPVEYOR_BUILD_FOLDER/install"
8990
- cmake --build . --parallel --config %CONFIGURATION% -- /m /v:minimal
9091

9192
deploy: off

.travis.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -415,13 +415,14 @@ before_script:
415415
script:
416416
- mkdir ./build
417417
- cd ./build
418-
- cmake -DCMAKE_CXX_COMPILER=$COMPILER ${CMAKE_BUILD_ENV} ..
418+
- cmake -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/install -DCMAKE_CXX_COMPILER=$COMPILER ${CMAKE_BUILD_ENV} ..
419419
- cmake --build . ${CMAKE_ENV}
420420
- ctest ${CTEST_ENV}
421+
- cmake --build . --target install ${CMAKE_ENV}
421422
- cd $TRAVIS_BUILD_DIR
422423
- mkdir ./build_test_cmake
423424
- cd ./build_test_cmake
424-
- cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -Dglm_DIR=$TRAVIS_BUILD_DIR/cmake/glm/
425+
- cmake -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/install
425426
- cmake --build .
426427

427428

0 commit comments

Comments
 (0)