Skip to content

Commit c824441

Browse files
committed
fix CI
1 parent 20e9b24 commit c824441

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

kth-bch/build/Common.targets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
88
<LibNamePrefix></LibNamePrefix>
99
<LibExtension>.dll</LibExtension>
10-
<ConanSettings></ConanSettings>
10+
<ConanSettings>-s compiler.cppstd=20</ConanSettings>
1111
</PropertyGroup>
1212
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
1313
<LibNamePrefix>lib</LibNamePrefix>
1414
<LibExtension>.so</LibExtension>
15-
<ConanSettings>-s compiler.libcxx=libstdc++11</ConanSettings>
15+
<ConanSettings>-s compiler.cppstd=20 -s compiler.libcxx=libstdc++11</ConanSettings>
1616
</PropertyGroup>
1717
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
1818
<LibNamePrefix>lib</LibNamePrefix>
1919
<LibExtension>.dylib</LibExtension>
20-
<ConanSettings></ConanSettings>
20+
<ConanSettings>-s compiler.cppstd=20</ConanSettings>
2121
</PropertyGroup>
2222

2323
<PropertyGroup>

kth/build/Common.targets

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
88
<LibNamePrefix></LibNamePrefix>
99
<LibExtension>.dll</LibExtension>
10-
<ConanSettings></ConanSettings>
10+
<ConanSettings>-s compiler.cppstd=20</ConanSettings>
1111
</PropertyGroup>
1212
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
1313
<LibNamePrefix>lib</LibNamePrefix>
1414
<LibExtension>.so</LibExtension>
15-
<ConanSettings>-s compiler.libcxx=libstdc++11</ConanSettings>
15+
<ConanSettings>-s compiler.cppstd=20 -s compiler.libcxx=libstdc++11</ConanSettings>
1616
</PropertyGroup>
1717
<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
1818
<LibNamePrefix>lib</LibNamePrefix>
1919
<LibExtension>.dylib</LibExtension>
20-
<ConanSettings></ConanSettings>
20+
<ConanSettings>-s compiler.cppstd=20</ConanSettings>
2121
</PropertyGroup>
2222

2323
<PropertyGroup>
@@ -75,7 +75,7 @@
7575
Condition="'$(HaveToExecConan)'=='True'" />
7676

7777
<WriteLinesToFile
78-
File="conanfile.txt" Lines="[settings];compiler.cppstd=20;[requires];c-api/$(KNUTH_VERSION);[options];c-api/*:shared=True;c-api/*:currency=$(KNUTH_CURRENCY);c-api/*:march_id=$(KNUTH_MARCH_ID);[imports];bin, *.dll -> .;lib, *.so -> .;lib, *.dylib -> ."
78+
File="conanfile.txt" Lines="[requires];c-api/$(KNUTH_VERSION);[options];c-api/*:shared=True;c-api/*:currency=$(KNUTH_CURRENCY);c-api/*:march_id=$(KNUTH_MARCH_ID);[imports];bin, *.dll -> .;lib, *.so -> .;lib, *.dylib -> ."
7979
Overwrite="true" Condition="'$(HaveToExecConan)'=='True'"/>
8080

8181
<Exec Command="conan install . --deployer=direct_deploy --deployer-folder=. $(ConanSettings) --update --build=missing"

0 commit comments

Comments
 (0)