aboutsummaryrefslogtreecommitdiff
path: root/test/postinstall
diff options
context:
space:
mode:
authorMike Taves <mwtoews@gmail.com>2020-04-17 14:14:19 +1200
committerMike Taves <mwtoews@gmail.com>2020-04-17 15:54:16 +1200
commita604ac8cdaba46f16672ff9d66226e478cc7fddf (patch)
tree3e1a52478ce78eb2462fcadf548e8792136ef2ea /test/postinstall
parent115c3db6bf66cc9b580f035c84b2d4626b787734 (diff)
downloadPROJ-a604ac8cdaba46f16672ff9d66226e478cc7fddf.tar.gz
PROJ-a604ac8cdaba46f16672ff9d66226e478cc7fddf.zip
AppVeyor: use Ninja generator, cache vcpkg [skip travis]
Diffstat (limited to 'test/postinstall')
-rwxr-xr-xtest/postinstall/test_cmake.bat16
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