mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-10-02 04:02:23 +03:00
VS: Remove duplicate import in compiler id vcxproj
Since commit d3c4c6d630 (VS: Import default C++ props file before
toolset-specific props file, 2023-03-01, v3.27.0-rc1~361^2) we import
`Microsoft.Cpp.Default.props` twice. Remove the extra import line, and
re-order imports as intended by the original change.
This commit is contained in:
1 parent
a69c783749
commit
e4fe26201f
2 files changed
+1
-4
No files matched your search
@@ -402,9 +402,6 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS}
|
||||
endif()
|
||||
endif()
|
||||
set(id_toolset_version_props "<Import Project=\"${CMAKE_GENERATOR_INSTANCE}\\VC\\Auxiliary\\Build${id_sep}${CMAKE_VS_PLATFORM_TOOLSET_VERSION}\\Microsoft.VCToolsVersion.${CMAKE_VS_PLATFORM_TOOLSET_VERSION}.props\" />")
|
||||
if(lang STREQUAL CXX OR lang STREQUAL C)
|
||||
set(id_toolset_version_props "<Import Project=\"$(VCTargetsPath)\\Microsoft.Cpp.Default.props\" />${id_toolset_version_props}")
|
||||
endif()
|
||||
unset(id_sep)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -18,8 +18,8 @@
|
||||
@id_ToolsetVCTargetsDir@
|
||||
@id_CustomGlobals@
|
||||
</PropertyGroup>
|
||||
@id_toolset_version_props@
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
@id_toolset_version_props@
|
||||
<PropertyGroup>
|
||||
@id_PreferredToolArchitecture@
|
||||
</PropertyGroup>
|
||||
|
||||
Reference in new issue
Block a user