mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: Remove duplicate import in compiler id vcxproj

Browse Source 
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:
Brad King
2023-08-18 09:49:25 -04:00
parent a69c783749
commit e4fe26201f
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CMakeDetermineCompilerId.cmake
View File

@@ -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()

2
Modules/CompilerId/VS-10.vcxproj.in
View File

@@ -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>