From 887827b762111a8e6b4765513b4be212fa6a5426 Mon Sep 17 00:00:00 2001
From: Krzysztof Kurek <krzysio.kurek@pm.me>
Date: Sun, 31 Jan 2021 16:13:05 +0100
Subject: [PATCH] Adjust CI to use the newly generated config files

---
 .appveyor.yml | 5 +++--
 .travis.yml   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 2b3807e1..5ce60281 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -74,10 +74,11 @@ before_build:
           $env:generator="$env:generator Win64"
       }
       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:
   - cmake --build . --parallel --config %CONFIGURATION% -- /m /v:minimal
+  - cmake --build . --target install --parallel --config %CONFIGURATION% -- /m /v:minimal
 
 test_script:
   - ctest --parallel 4 --verbose -C %CONFIGURATION%
@@ -85,7 +86,7 @@ test_script:
   - ps: |
       mkdir 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
 
 deploy: off
diff --git a/.travis.yml b/.travis.yml
index 9809754e..413501fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -415,13 +415,14 @@ before_script:
 script:
   - mkdir ./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}
   - ctest ${CTEST_ENV}
+  - cmake --build . --target install ${CMAKE_ENV}
   - 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 -DCMAKE_CXX_COMPILER=$COMPILER $TRAVIS_BUILD_DIR/test/cmake/ -DCMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/install
   - cmake --build .