File tree Expand file tree Collapse file tree 5 files changed +43
-6
lines changed
Expand file tree Collapse file tree 5 files changed +43
-6
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ env_vars {
1010
1111env_vars {
1212 key: " BUILD_GENERATOR"
13- value: " Visual Studio 15 2017 Win64 "
13+ value: " Visual Studio 15 2017"
1414}
1515
1616env_vars {
Original file line number Diff line number Diff line change @@ -15,5 +15,5 @@ env_vars {
1515
1616env_vars {
1717 key: " BUILD_TARGET_ARCH"
18- value: " x86 "
18+ value: " Win32 "
1919}
Original file line number Diff line number Diff line change @@ -26,19 +26,18 @@ if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
2626git submodule update --init
2727if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
2828
29- SET MSBUILD = " C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\MSBuild"
3029SET CONFIG = Release
3130
3231mkdir %SRC% \build
3332cd %SRC% \build
3433if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
3534
3635IF /I " %BUILD_SYSTEM% " == " cmake" (
37- cmake .. -G " %BUILD_GENERATOR% " " -DCPPDAP_BUILD_TESTS=1" " -DCPPDAP_BUILD_EXAMPLES=1" " -DCPPDAP_WARNINGS_AS_ERRORS=1"
36+ cmake .. -G " %BUILD_GENERATOR% " -A %BUILD_TARGET_ARCH% " -DCPPDAP_BUILD_TESTS=1" " -DCPPDAP_BUILD_EXAMPLES=1" " -DCPPDAP_WARNINGS_AS_ERRORS=1"
3837 if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
39- %MSBUILD% /p:Configuration= %CONFIG% cppdap.sln
38+ cmake --build . --config %CONFIG%
4039 if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
41- Release \cppdap-unittests.exe
40+ %CONFIG% \cppdap-unittests.exe
4241 if !ERRORLEVEL! neq 0 exit !ERRORLEVEL!
4342) ELSE (
4443 echo " Unknown build system: %BUILD_SYSTEM% "
Original file line number Diff line number Diff line change 1+ # Format: //devtools/kokoro/config/proto/build.proto
2+
3+ # Location of the continuous bash script in Git.
4+ build_file: " cppdap/kokoro/windows/presubmit.bat"
5+
6+ env_vars {
7+ key: " BUILD_SYSTEM"
8+ value: " cmake"
9+ }
10+
11+ env_vars {
12+ key: " BUILD_GENERATOR"
13+ value: " Visual Studio 17 2022"
14+ }
15+
16+ env_vars {
17+ key: " BUILD_TARGET_ARCH"
18+ value: " x64"
19+ }
Original file line number Diff line number Diff line change 1+ # Format: //devtools/kokoro/config/proto/build.proto
2+
3+ # Location of the continuous bash script in Git.
4+ build_file: " cppdap/kokoro/windows/presubmit.bat"
5+
6+ env_vars {
7+ key: " BUILD_SYSTEM"
8+ value: " cmake"
9+ }
10+
11+ env_vars {
12+ key: " BUILD_GENERATOR"
13+ value: " Visual Studio 17 2022"
14+ }
15+
16+ env_vars {
17+ key: " BUILD_TARGET_ARCH"
18+ value: " Win32"
19+ }
You can’t perform that action at this time.
0 commit comments