diff options
| author | Zsolt Parragi <zsolt.parragi@cancellar.hu> | 2019-03-21 18:49:11 (GMT) |
|---|---|---|
| committer | Zsolt Parragi <zsolt.parragi@cancellar.hu> | 2019-05-24 06:43:42 (GMT) |
| commit | 4819ff964714faec8ad2d92a3ee541b19196bcfc (patch) | |
| tree | b9e8602e7ebf86a10c67b7fa7b919a230f3dee56 /Tests/Module | |
| parent | 26af0b25e77ba48b6d015adef6d54b6725fd7977 (diff) | |
| download | CMake-4819ff964714faec8ad2d92a3ee541b19196bcfc.zip CMake-4819ff964714faec8ad2d92a3ee541b19196bcfc.tar.gz CMake-4819ff964714faec8ad2d92a3ee541b19196bcfc.tar.bz2 | |
Tests: fix failures with gnu mode clang on windows
Root causes were:
* Using incorrect conditions (assuming MSVC-like command line mode)
* Trying to compile the MSVC STL in C++11 mode, when parts of it require
C++14 or enabling MS extensions in clang.
* Missing flush in a testcase using stdout in a dll and a main part
with static crt
Diffstat (limited to 'Tests/Module')
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index cffef5a..b30928d 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt +++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt @@ -133,7 +133,9 @@ endif() # for msvc the compiler version determines which c++11 features are available. if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" - OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")) + OR (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" + AND "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC" + AND "x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xMSVC" )) if(";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_delegating_constructors;") list(APPEND true_defs EXPECTED_COMPILER_CXX_DELEGATING_CONSTRUCTORS) list(APPEND true_defs EXPECTED_COMPILER_CXX_VARIADIC_TEMPLATES) |