Merge topic 'vs-props-order'

e4fe26201f VS: Remove duplicate import in compiler id vcxproj

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8740

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

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>