From 4ff5746258f02481326c47a7ccd509a669dc389c Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Thu, 26 Mar 2020 14:54:52 -0700 Subject: [PATCH] Fix merge errors --- Modules/CMakeDetermineCompilerId.cmake | 3 +-- VSInsertion/Packaging/cgmanifest.json | 14 -------------- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 VSInsertion/Packaging/cgmanifest.json diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index f274a2f8605..d125791f224 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -246,8 +246,7 @@ Id flags: ${testflags} ${CMAKE_${lang}_COMPILER_ID_FLAGS_ALWAYS} set(id_platform ${CMAKE_VS_PLATFORM_NAME}) set(id_lang "${lang}") set(id_PostBuildEvent_Command "") - if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "^[Ll][Ll][Vv][Mm]$" - OR CMAKE_VS_PLATFORM_TOOLSET MATCHES "^[Cc][Ll][Aa][Nn][Gg][Cc][Ll]$") + if(CMAKE_VS_PLATFORM_TOOLSET MATCHES "^([Ll][Ll][Vv][Mm](_v[0-9]+(_xp)?)?|[Cc][Ll][Aa][Nn][Gg][Cc][Ll])$") set(id_cl_var "ClangClExecutable") elseif(CMAKE_VS_PLATFORM_TOOLSET MATCHES "v[0-9]+_clang_.*") set(id_cl clang.exe) diff --git a/VSInsertion/Packaging/cgmanifest.json b/VSInsertion/Packaging/cgmanifest.json deleted file mode 100644 index 32c90f8bdbc..00000000000 --- a/VSInsertion/Packaging/cgmanifest.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "Registrations":[ - { - "component": { - "type": "git", - "git": { - "repositoryUrl": "https://gitlab.kitware.com/cmake/cmake.git", - "commitHash": "1b4482f65dd41f21ec8abc0777b8dc1f0381bbd6" // HEAD -> release, tag: v3.16.0, origin/release - } - } - } - ], - "Version": 1 -}