diff options
author | Martin Matuska <martin@matuska.org> | 2022-02-17 17:09:00 +0100 |
---|---|---|
committer | Martin Matuska <martin@matuska.org> | 2022-02-17 17:10:51 +0100 |
commit | 93f03b0f5d7316714df9b289a49150ab7a63bfaf (patch) | |
tree | 8ed59e6c651840600d2c94e04a6a8142979b680a /build/ci | |
parent | 52efa50c69653029687bfc545703b7340b7a51e2 (diff) | |
download | libarchive-93f03b0f5d7316714df9b289a49150ab7a63bfaf.tar.gz |
ci (GitHub Actions): build on Windows 2022 and use Visual Studio 17 2022
Diffstat (limited to 'build/ci')
-rwxr-xr-x | build/ci/github_actions/ci.cmd | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/ci/github_actions/ci.cmd b/build/ci/github_actions/ci.cmd index 23e2a949..7adb98f9 100755 --- a/build/ci/github_actions/ci.cmd +++ b/build/ci/github_actions/ci.cmd @@ -51,7 +51,7 @@ IF "%1"=="deplibs" ( mingw32-make test || EXIT /b 1 mingw32-make install || EXIT /b 1 ) ELSE IF "%BE%"=="msvc" ( - cmake -G "Visual Studio 16 2019" . || EXIT /b 1 + cmake -G "Visual Studio 17 2022" . || EXIT /b 1 cmake --build . --target ALL_BUILD --config Release || EXIT /b 1 cmake --build . --target RUN_TESTS --config Release || EXIT /b 1 cmake --build . --target INSTALL --config Release || EXIT /b 1 @@ -65,7 +65,7 @@ IF "%1"=="deplibs" ( REM mingw32-make test || EXIT /b 1 mingw32-make install || EXIT /b 1 ) ELSE IF "%BE%"=="msvc" ( - cmake -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE="Release" -D ENABLE_LIB_ONLY=ON -D ENABLE_SHARED_LIB=OFF -D ENABLE_STATIC_LIB=ON . || EXIT /b 1 + cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" -D ENABLE_LIB_ONLY=ON -D ENABLE_SHARED_LIB=OFF -D ENABLE_STATIC_LIB=ON . || EXIT /b 1 cmake --build . --target ALL_BUILD --config Release || EXIT /b 1 REM cmake --build . --target RUN_TESTS --config Release || EXIT /b 1 cmake --build . --target INSTALL --config Release || EXIT /b 1 @@ -78,7 +78,7 @@ IF "%1"=="deplibs" ( mingw32-make || EXIT /b 1 mingw32-make install || EXIT /b 1 ) ELSE IF "%BE%"=="msvc" ( - cmake -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1 + cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" . || EXIT /b 1 cmake --build . --target ALL_BUILD --config Release || EXIT /b 1 cmake --build . --target INSTALL --config Release || EXIT /b 1 ) @@ -91,7 +91,7 @@ IF "%1"=="deplibs" ( ) ELSE IF "%BE%"=="msvc" ( MKDIR build_ci\cmake CD build_ci\cmake - cmake -G "Visual Studio 16 2019" -D CMAKE_BUILD_TYPE="Release" -D ZLIB_LIBRARY="C:/Program Files (x86)/zlib/lib/zlibstatic.lib" -D ZLIB_INCLUDE_DIR="C:/Program Files (x86)/zlib/include" -D BZIP2_LIBRARIES="C:/Program Files (x86)/bzip2/lib/bz2.lib" -D BZIP2_INCLUDE_DIR="C:/Program Files (x86)/bzip2/include" -D LIBLZMA_LIBRARY="C:/Program Files (x86)/xz/lib/liblzma.lib" -D LIBLZMA_INCLUDE_DIR="C:/Program Files (x86)/xz/include" ..\.. || EXIT /b 1 + cmake -G "Visual Studio 17 2022" -D CMAKE_BUILD_TYPE="Release" -D ZLIB_LIBRARY="C:/Program Files (x86)/zlib/lib/zlibstatic.lib" -D ZLIB_INCLUDE_DIR="C:/Program Files (x86)/zlib/include" -D BZIP2_LIBRARIES="C:/Program Files (x86)/bzip2/lib/bz2.lib" -D BZIP2_INCLUDE_DIR="C:/Program Files (x86)/bzip2/include" -D LIBLZMA_LIBRARY="C:/Program Files (x86)/xz/lib/liblzma.lib" -D LIBLZMA_INCLUDE_DIR="C:/Program Files (x86)/xz/include" ..\.. || EXIT /b 1 ) ) ELSE IF "%1%"=="build" ( IF "%BE%"=="mingw-gcc" ( |