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:12 (GMT) |
| commit | db09cc188fd7769ad3504689a14093056b54d35c (patch) | |
| tree | 4aa84b006e9bfe0a17f815a36a6affbe68b13115 /Modules/CMakeDetermineCompilerId.cmake | |
| parent | f23f8523ddeee7b6e7534669a98dd7a05ce9171d (diff) | |
| parent | e4fe26201fd32bcb5dc7db203f1141e5c1aeb019 (diff) | |
| download | CMake-db09cc188fd7769ad3504689a14093056b54d35c.zip CMake-db09cc188fd7769ad3504689a14093056b54d35c.tar.gz CMake-db09cc188fd7769ad3504689a14093056b54d35c.tar.bz2 | |
Merge topic 'vs-props-order'
e4fe26201f VS: Remove duplicate import in compiler id vcxproj
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8740
Diffstat (limited to 'Modules/CMakeDetermineCompilerId.cmake')
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 4db9aa8..9d3b60f 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() |