diff options
| author | Brad King <brad.king@kitware.com> | 2023-08-19 12:40:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-08-19 12:40:11 (GMT) |
| commit | 26dfdd76e6b418d7996821672c7f5cd8c69cbb51 (patch) | |
| tree | 885f1da569dcbd59b7257b77dc402b5e852dcd34 | |
| parent | 882b8c1d36c9b654754e4e19dfede30e01119dad (diff) | |
| parent | e4fe26201fd32bcb5dc7db203f1141e5c1aeb019 (diff) | |
| download | CMake-26dfdd76e6b418d7996821672c7f5cd8c69cbb51.zip CMake-26dfdd76e6b418d7996821672c7f5cd8c69cbb51.tar.gz CMake-26dfdd76e6b418d7996821672c7f5cd8c69cbb51.tar.bz2 | |
Merge topic 'vs-props-order' into release-3.27
e4fe26201f VS: Remove duplicate import in compiler id vcxproj
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8740
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 3 | ||||
| -rw-r--r-- | Modules/CompilerId/VS-10.vcxproj.in | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 6c49096..2cf9853 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -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() diff --git a/Modules/CompilerId/VS-10.vcxproj.in b/Modules/CompilerId/VS-10.vcxproj.in index fa324d8..adb9d49 100644 --- a/Modules/CompilerId/VS-10.vcxproj.in +++ b/Modules/CompilerId/VS-10.vcxproj.in @@ -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> |