diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2020-04-17 20:29:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 20:29:13 +0200 |
| commit | 7920a3fed18d67262003d19131f2adf2e4aa4fb2 (patch) | |
| tree | 204b653ecbe5f927de7e0cf57922d3fb023a316f /test | |
| parent | 8cce7b5702a5eacd1ddde69ea875f8aa1005ce8e (diff) | |
| parent | a604ac8cdaba46f16672ff9d66226e478cc7fddf (diff) | |
| download | PROJ-7920a3fed18d67262003d19131f2adf2e4aa4fb2.tar.gz PROJ-7920a3fed18d67262003d19131f2adf2e4aa4fb2.zip | |
Merge pull request #2159 from mwtoews/ci
AppVeyor: use Ninja generator, cache vcpkg installed packages
Diffstat (limited to 'test')
| -rwxr-xr-x | test/postinstall/test_cmake.bat | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/test/postinstall/test_cmake.bat b/test/postinstall/test_cmake.bat index d2e7baaf..8eba4e78 100755 --- a/test/postinstall/test_cmake.bat +++ b/test/postinstall/test_cmake.bat @@ -22,18 +22,22 @@ del /f /q build 2> nul :: Check CMake project name PROJ md build cd build -cmake -G "%VS_FULL%" -DCMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH% -DUSE_PROJ_NAME=PROJ .. || exit /B 2 -cmake --build . --config Release || exit /B 3 -ctest --build-config Release -VV || exit /B 4 +cmake -GNinja -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH% ^ + -DUSE_PROJ_NAME=PROJ .. || exit /B 2 +ninja -v || exit /B 3 +ctest -VV || exit /B 4 cd .. del /f /q build :: Check legacy CMake project name PROJ4 md build cd build -cmake -G "%VS_FULL%" -DCMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH% -DUSE_PROJ_NAME=PROJ4 .. || exit /B 2 -cmake --build . --config Release || exit /B 3 -ctest --build-config Release -VV || exit /B 4 +cmake -GNinja -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_PREFIX_PATH=%CMAKE_PREFIX_PATH% ^ + -DUSE_PROJ_NAME=PROJ4 .. || exit /B 2 +ninja -v || exit /B 3 +ctest -VV || exit /B 4 cd .. del /f /q build |