diff options
author | Brad King <brad.king@kitware.com> | 2017-11-29 13:27:15 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-29 13:29:36 (GMT) |
commit | d5cad740789bdb2933b5d189f5cd5b7aada9700b (patch) | |
tree | 32e39de5adb58cda7d4a52f9b23772c7c2e607cb /Modules | |
parent | caffddd620393fd9c73c1ce97d0451ce5570dedf (diff) | |
parent | f969f1a9ce1d0045b9d056fd08c4683c34c420fa (diff) | |
download | CMake-d5cad740789bdb2933b5d189f5cd5b7aada9700b.zip CMake-d5cad740789bdb2933b5d189f5cd5b7aada9700b.tar.gz CMake-d5cad740789bdb2933b5d189f5cd5b7aada9700b.tar.bz2 |
Merge topic 'clang-cl-fix'
f969f1a9 Clang: Do not mistake clang-cl 6.0 for GNU-like clang
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1522
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 6 |
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() |