mewin/cppdap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kokoro: Add vs2022 configs (#139)

Browse Source 
Pass target CPU architecture explicitly vis BUILD_TARGET_ARCH

Use cmake --build to build, instead of hardcoding the path to msbuild
This commit is contained in:
David Neto 2025-01-10 17:29:58 -05:00 committed by GitHub
parent 82beeea910
commit 167b131a66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kokoro/windows/msvc-14.14-x64/cmake/presubmit.cfg
View File

@ -10,7 +10,7 @@ env_vars {
env_vars { env_vars {
key: "BUILD_GENERATOR" key: "BUILD_GENERATOR"
value: "Visual Studio 15 2017 Win64" value: "Visual Studio 15 2017"
} }
env_vars { env_vars {

2
kokoro/windows/msvc-14.14-x86/cmake/presubmit.cfg
View File

@ -15,5 +15,5 @@ env_vars {
env_vars { env_vars {
key: "BUILD_TARGET_ARCH" key: "BUILD_TARGET_ARCH"
value: "x86" value: "Win32"
} }

7
kokoro/windows/presubmit.bat
View File

@ -26,7 +26,6 @@ if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
git submodule update --init git submodule update --init
if !ERRORLEVEL! neq 0 exit !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
SET MSBUILD="C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild"
SET CONFIG=Release SET CONFIG=Release
mkdir %SRC%\build mkdir %SRC%\build
@ -34,11 +33,11 @@ cd %SRC%\build
if !ERRORLEVEL! neq 0 exit !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
IF /I "%BUILD_SYSTEM%"=="cmake" ( IF /I "%BUILD_SYSTEM%"=="cmake" (
cmake .. -G "%BUILD_GENERATOR%" "-DCPPDAP_BUILD_TESTS=1" "-DCPPDAP_BUILD_EXAMPLES=1" "-DCPPDAP_WARNINGS_AS_ERRORS=1" cmake .. -G "%BUILD_GENERATOR%" -A %BUILD_TARGET_ARCH% "-DCPPDAP_BUILD_TESTS=1" "-DCPPDAP_BUILD_EXAMPLES=1" "-DCPPDAP_WARNINGS_AS_ERRORS=1"
if !ERRORLEVEL! neq 0 exit !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
%MSBUILD% /p:Configuration=%CONFIG% cppdap.sln cmake --build . --config %CONFIG%
if !ERRORLEVEL! neq 0 exit !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
Release\cppdap-unittests.exe %CONFIG%\cppdap-unittests.exe
if !ERRORLEVEL! neq 0 exit !ERRORLEVEL! if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
) ELSE ( ) ELSE (
echo "Unknown build system: %BUILD_SYSTEM%" echo "Unknown build system: %BUILD_SYSTEM%"

19
kokoro/windows/vs2022-amd64/cmake/presubmit.cfg Normal file
View File

@ -0,0 +1,19 @@
# Format: //devtools/kokoro/config/proto/build.proto
# Location of the continuous bash script in Git.
build_file: "cppdap/kokoro/windows/presubmit.bat"
env_vars {
key: "BUILD_SYSTEM"
value: "cmake"
}
env_vars {
key: "BUILD_GENERATOR"
value: "Visual Studio 17 2022"
}
env_vars {
key: "BUILD_TARGET_ARCH"
value: "x64"
}

19
kokoro/windows/vs2022-x86/cmake/presubmit.cfg Normal file
View File

@ -0,0 +1,19 @@
# Format: //devtools/kokoro/config/proto/build.proto
# Location of the continuous bash script in Git.
build_file: "cppdap/kokoro/windows/presubmit.bat"
env_vars {
key: "BUILD_SYSTEM"
value: "cmake"
}
env_vars {
key: "BUILD_GENERATOR"
value: "Visual Studio 17 2022"
}
env_vars {
key: "BUILD_TARGET_ARCH"
value: "Win32"
}