mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

chore: VS 更新后重新编译 conan 依赖

Browse source
This commit is contained in:
Xu 2026-02-13 09:35:48 +08:00
commit 65ffd9a1aa
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/_ConanDeps/_ConanDeps.vcxproj
View file

@ -110,6 +110,8 @@ ConanFile = conanFiles.ToArray();
<AdditionalFlags Condition="$(UseClangCL) And $(UseNativeMicroArch)">$(AdditionalFlags),'/clang:-march=native'</AdditionalFlags>
<AdditionalFlags Condition="!$(UseClangCL) And '$(Configuration)' == 'Release'">$(AdditionalFlags),'/GL'</AdditionalFlags>
<AdditionalOptions Condition="'$(AdditionalFlags)' != ''">-c:a tools.build:cxxflags=[$(AdditionalFlags)] -c:a tools.build:cflags=[$(AdditionalFlags)]</AdditionalOptions>
<!-- 传入 MSBuild 版本使得 VS 更新后触发重新编译。MSBuild 的更新频率比编译器慢，但够用了 -->
<AdditionalOptions>-c:a user.magpie:msbuild_version=$(MSBuildVersion) $(AdditionalOptions)</AdditionalOptions>
<!-- profile 面向 VS2026，VS2022 上应更改编译器版本 -->
<AdditionalOptions Condition="$(VS17) And $(UseClangCL)">-s:a compiler.version=19 -c:a &quot;tools.cmake.cmaketoolchain:generator=Visual Studio 17&quot; $(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions Condition="$(VS17) And !$(UseClangCL)">-s:a compiler.version=194 $(AdditionalOptions)</AdditionalOptions>

2
src/_ConanDeps/clang-cl.profile
View file

@ -7,4 +7,4 @@ compiler.cppstd=gnu17
[conf]
tools.cmake.cmaketoolchain:generator=Visual Studio 18
tools.info.package_id:confs=["tools.build:cxxflags"]
tools.info.package_id:confs=["tools.build:cxxflags", "user.magpie:msbuild_version"]

2
src/_ConanDeps/msvc.profile
View file

@ -6,4 +6,4 @@ compiler.runtime=static
compiler.cppstd=17
[conf]
tools.info.package_id:confs=["tools.build:cxxflags"]
tools.info.package_id:confs=["tools.build:cxxflags", "user.magpie:msbuild_version"]