summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-10-25 11:39:12 (GMT)
committerBrad King <brad.king@kitware.com>2017-10-25 11:39:12 (GMT)
commita720131006d81f8c10783ac12e4ef172d5e2d690 (patch)
tree4858432c40340ae308661066930989fe0929b8f2
parentb305e81b3e7e517cb445a4d0dfba127a3e563170 (diff)
parent7077a554f14ad1cc5682d6bc8c2d05d1aff2a270 (diff)
downloadCMake-a720131006d81f8c10783ac12e4ef172d5e2d690.zip
CMake-a720131006d81f8c10783ac12e4ef172d5e2d690.tar.gz
CMake-a720131006d81f8c10783ac12e4ef172d5e2d690.tar.bz2
Merge branch 'clang-cl-TP' into release-3.10
Merge-request: !1407
-rw-r--r--Modules/Platform/Windows-Clang-CXX.cmake1
-rw-r--r--Modules/Platform/Windows-Clang.cmake1
2 files changed, 2 insertions, 0 deletions
diff --git a/Modules/Platform/Windows-Clang-CXX.cmake b/Modules/Platform/Windows-Clang-CXX.cmake
index 2c3688a..f1d40f2 100644
--- a/Modules/Platform/Windows-Clang-CXX.cmake
+++ b/Modules/Platform/Windows-Clang-CXX.cmake
@@ -1,2 +1,3 @@
include(Platform/Windows-Clang)
+set(_COMPILE_CXX_MSVC " -TP")
__windows_compiler_clang(CXX)
diff --git a/Modules/Platform/Windows-Clang.cmake b/Modules/Platform/Windows-Clang.cmake
index bcfda93..007ae53 100644
--- a/Modules/Platform/Windows-Clang.cmake
+++ b/Modules/Platform/Windows-Clang.cmake
@@ -12,6 +12,7 @@ if("x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC"
OR "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
include(Platform/Windows-MSVC)
macro(__windows_compiler_clang lang)
+ set(_COMPILE_${lang} "${_COMPILE_${lang}_MSVC}")
__windows_compiler_msvc(${lang})
endmacro()
else()