diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-19 12:58:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-19 12:58:13 (GMT) |
| commit | da846439881dbbe3697ae42fa129031cb8f467c0 (patch) | |
| tree | 7759a58069ca59a6507a7553dd106b8e6d112b1b | |
| parent | 13f020198fe858437f24a3fe0c349a1618e70d7b (diff) | |
| parent | b186329d3db0083d77e61ded709f4e70a596631d (diff) | |
| download | CMake-da846439881dbbe3697ae42fa129031cb8f467c0.zip CMake-da846439881dbbe3697ae42fa129031cb8f467c0.tar.gz CMake-da846439881dbbe3697ae42fa129031cb8f467c0.tar.bz2 | |
Merge branch 'asm-no-slash-question' into release-3.14
Merge-request: !2984
| -rw-r--r-- | Modules/CMakeDetermineASMCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCompilerId.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineVSServicePack.cmake | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeDetermineASMCompiler.cmake b/Modules/CMakeDetermineASMCompiler.cmake index dbc41c8..ac27f87 100644 --- a/Modules/CMakeDetermineASMCompiler.cmake +++ b/Modules/CMakeDetermineASMCompiler.cmake @@ -83,7 +83,7 @@ if(NOT CMAKE_ASM${ASM_DIALECT}_COMPILER_ID) set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_XL "XL C") list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS MSVC ) - set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_MSVC "/?") + set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_FLAGS_MSVC "-?") set(CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDOR_REGEX_MSVC "Microsoft") list(APPEND CMAKE_ASM${ASM_DIALECT}_COMPILER_ID_VENDORS TI ) diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index 83ce392..8ba4246 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -824,7 +824,7 @@ function(CMAKE_DIAGNOSE_UNSUPPORTED_CLANG lang envvar) endif() # Test whether an MSVC-like command-line option works. - execute_process(COMMAND "${CMAKE_${lang}_COMPILER}" /? + execute_process(COMMAND "${CMAKE_${lang}_COMPILER}" -? RESULT_VARIABLE _clang_result OUTPUT_VARIABLE _clang_stdout ERROR_VARIABLE _clang_stderr) diff --git a/Modules/CMakeDetermineVSServicePack.cmake b/Modules/CMakeDetermineVSServicePack.cmake index 9edc309..a3c4d9c 100644 --- a/Modules/CMakeDetermineVSServicePack.cmake +++ b/Modules/CMakeDetermineVSServicePack.cmake @@ -79,7 +79,7 @@ endfunction() function(_DetermineVSServicePack_FastCheckVersionWithCompiler _SUCCESS_VAR _VERSION_VAR) if(EXISTS ${CMAKE_CXX_COMPILER}) execute_process( - COMMAND ${CMAKE_CXX_COMPILER} /? + COMMAND ${CMAKE_CXX_COMPILER} -? ERROR_VARIABLE _output OUTPUT_QUIET ) |