Skip to content
Snippets Groups Projects
Commit e4fe2620 authored by Brad King's avatar Brad King
Browse files

VS: Remove duplicate import in compiler id vcxproj

Since commit d3c4c6d6 (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.
parent a69c7837
No related merge requests found
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment