diff options
| author | Zsolt Parragi <zsolt.parragi@cancellar.hu> | 2019-07-06 12:56:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-07-09 15:30:25 (GMT) |
| commit | 417eb5739a35a57bc345bf32c56c80d13e33b292 (patch) | |
| tree | 7a764345fde7e35e565d8d3ff4d42409938e49e1 /Tests/Preprocess | |
| parent | f56393f0bd4d54db7885e89e8019c5e790bd6aa6 (diff) | |
| download | CMake-417eb5739a35a57bc345bf32c56c80d13e33b292.zip CMake-417eb5739a35a57bc345bf32c56c80d13e33b292.tar.gz CMake-417eb5739a35a57bc345bf32c56c80d13e33b292.tar.bz2 | |
Tests: fix some Clang failures on Windows
* Execute MSVCRuntimeLibrary tests for GNU command line mode Clang on
Windows using the MSVC ABI
* Assembler tests should be executed with the Ninja generator
* Assembler tests shouldn't be executed with clang-cl
* Fixed a condition in the Preprocess test for clang-cl
* Adjusted the conditions on some MSVC specific tests
Diffstat (limited to 'Tests/Preprocess')
| -rw-r--r-- | Tests/Preprocess/CMakeLists.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Tests/Preprocess/CMakeLists.txt b/Tests/Preprocess/CMakeLists.txt index 588af03..bce1b3f 100644 --- a/Tests/Preprocess/CMakeLists.txt +++ b/Tests/Preprocess/CMakeLists.txt @@ -29,7 +29,10 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio") set(PP_VS 1) endif() if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND - "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC" AND + "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC") + set(CLANG_MSVC_WINDOWS 1) +endif() +if(CLANG_MSVC_WINDOWS AND "x${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU") set(CLANG_GNULIKE_WINDOWS 1) endif() @@ -106,7 +109,7 @@ endif() set(EXPR_OP1 "/") if((NOT MSVC OR PP_NMAKE) AND NOT CMAKE_C_COMPILER_ID STREQUAL "Intel" AND - NOT CLANG_GNULIKE_WINDOWS) + NOT CLANG_MSVC_WINDOWS) # MSVC cl, Intel icl: % # When the cl compiler is invoked from the command line then % must # be written %% (to distinguish from %ENV% syntax). However cl does |