summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-11-28 16:09:53 (GMT)
committerBrad King <brad.king@kitware.com>2017-11-28 16:09:53 (GMT)
commit79ad921a38190e38d10c89f9c7dad1fc78b52986 (patch)
treece5627108c640b0fa988964691dfc50f2be3daa9
parent93e7eb7bc5c26aa0bf74887a1c5ba36bfce74bea (diff)
parentf969f1a9ce1d0045b9d056fd08c4683c34c420fa (diff)
downloadCMake-79ad921a38190e38d10c89f9c7dad1fc78b52986.zip
CMake-79ad921a38190e38d10c89f9c7dad1fc78b52986.tar.gz
CMake-79ad921a38190e38d10c89f9c7dad1fc78b52986.tar.bz2
Merge branch 'clang-cl-fix' into release-3.10
Merge-request: !1522
-rw-r--r--Modules/CMakeDetermineCompilerId.cmake6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake
index 347106e..15c304c 100644
--- a/Modules/CMakeDetermineCompilerId.cmake
+++ b/Modules/CMakeDetermineCompilerId.cmake
@@ -742,12 +742,12 @@ function(CMAKE_DIAGNOSE_UNSUPPORTED_CLANG lang envvar)
return()
endif()
- # Test whether a GNU-like command-line option works.
- execute_process(COMMAND "${CMAKE_${lang}_COMPILER}" --version
+ # Test whether an MSVC-like command-line option works.
+ execute_process(COMMAND "${CMAKE_${lang}_COMPILER}" /?
RESULT_VARIABLE _clang_result
OUTPUT_VARIABLE _clang_stdout
ERROR_VARIABLE _clang_stderr)
- if(NOT _clang_result EQUAL 0)
+ if(_clang_result EQUAL 0)
return()
endif()