summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-01-12 14:51:26 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-01-12 14:51:31 (GMT)
commit67442ca471614178ed27eaaf7fd2cda81510d5d7 (patch)
treebf819fdbec8b8d5d002b675debfa4f89b0dab548
parenteb4e99563c7247404872c4b3064b6061a05dd5f2 (diff)
parent3a8b6653dcd3b860957f6dfbe7d764b695b29d28 (diff)
downloadCMake-67442ca471614178ed27eaaf7fd2cda81510d5d7.zip
CMake-67442ca471614178ed27eaaf7fd2cda81510d5d7.tar.gz
CMake-67442ca471614178ed27eaaf7fd2cda81510d5d7.tar.bz2
Merge topic 'msvc-isystem' into release-3.22
3a8b6653dc MSVC: Use -external:I flag without space to support Clang tools Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6855
-rw-r--r--Modules/Compiler/MSVC-C.cmake2
-rw-r--r--Modules/Compiler/MSVC-CXX.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/MSVC-C.cmake b/Modules/Compiler/MSVC-C.cmake
index a53df46..df3691c 100644
--- a/Modules/Compiler/MSVC-C.cmake
+++ b/Modules/Compiler/MSVC-C.cmake
@@ -77,6 +77,6 @@ endif()
# The `/external:I` flag was made non-experimental in 19.29.30036.3.
if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30036.3)
- set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-external:I ")
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-external:I")
set(_CMAKE_INCLUDE_SYSTEM_FLAG_C_WARNING "-external:W0 ")
endif ()
diff --git a/Modules/Compiler/MSVC-CXX.cmake b/Modules/Compiler/MSVC-CXX.cmake
index bcaec69..17cbc3c 100644
--- a/Modules/Compiler/MSVC-CXX.cmake
+++ b/Modules/Compiler/MSVC-CXX.cmake
@@ -84,6 +84,6 @@ endif()
# The `/external:I` flag was made non-experimental in 19.29.30036.3.
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.29.30036.3)
- set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-external:I ")
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-external:I")
set(_CMAKE_INCLUDE_SYSTEM_FLAG_CXX_WARNING "-external:W0 ")
endif ()