File tree Expand file tree Collapse file tree 3 files changed +10
-5
lines changed
Expand file tree Collapse file tree 3 files changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -173,7 +173,7 @@ jobs:
173173 include :
174174 - os : windows-latest
175175 generator : " Visual Studio 17 2022"
176- additional_cmake_flags : ' -A x64'
176+ additional_cmake_flags : ' -A x64 -DCMAKE_GENERATOR_TOOLSET=v142 '
177177
178178 - os : ubuntu-latest
179179 generator : " Ninja"
@@ -190,7 +190,7 @@ jobs:
190190
191191 - os : windows-latest
192192 generator : " Visual Studio 17 2022"
193- additional_cmake_flags : ' -A x64'
193+ additional_cmake_flags : ' -A x64 -DCMAKE_GENERATOR_TOOLSET=v142 '
194194 debug_or_release : RelWithDebInfo
195195 shared_or_static : static
196196
Original file line number Diff line number Diff line change @@ -927,6 +927,7 @@ function(auib_import AUI_MODULE_NAME URL)
927927 CMAKE_C_FLAGS
928928 CMAKE_CXX_FLAGS
929929 CMAKE_GENERATOR_PLATFORM
930+ CMAKE_GENERATOR_TOOLSET
930931 CMAKE_VS_PLATFORM_NAME
931932 CMAKE_BUILD_TYPE
932933 CMAKE_CONFIGURATION_TYPES
Original file line number Diff line number Diff line change @@ -57,14 +57,18 @@ TEST_F(ProcessTest, Self) {
5757 EXPECT_TRUE (mSelf .isEffectivelyAccessible (AFileAccess::X));
5858}
5959
60+
61+ #if !AUI_PLATFORM_WIN
62+ // compilation breaks on older msvc
6063TEST_F (ProcessTest, ExitCode) {
6164 auto process = AProcess::create ({
62- .executable = mSelf ,
63- .args = AProcess::ArgStringList { { " --help" } },
64- });
65+ .executable = mSelf ,
66+ .args = AProcess::ArgStringList { { " --help" } },
67+ });
6568 process->run ();
6669 EXPECT_EQ (process->waitForExitCode (), 0 );
6770}
71+ #endif
6872
6973TEST_F (ProcessTest, Stdout) {
7074 for (const auto & i : info ()) {
You can’t perform that action at this time.
0 commit comments