diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-25 15:18:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-25 15:18:37 (GMT) |
| commit | cbec5c0445eb48d88d70abae77c0c0a8debd6a41 (patch) | |
| tree | eaa5ec1bfd75e1650b654fe61f3f90ecb0a000de /Tests/CMakeLists.txt | |
| parent | ce64e3607f0bccb4b1239d28510c92bc264904ea (diff) | |
| parent | f327a9fd26a24b2aaf609a9b3d34258c7a992bb3 (diff) | |
| download | CMake-cbec5c0445eb48d88d70abae77c0c0a8debd6a41.zip CMake-cbec5c0445eb48d88d70abae77c0c0a8debd6a41.tar.gz CMake-cbec5c0445eb48d88d70abae77c0c0a8debd6a41.tar.bz2 | |
Merge topic 'default-lang-dialect-for-master'
f327a9fd Merge branch 'default-lang-dialect' into step2
36bb100e Fix the test for running the CxxDialog unit test.
a3d0ae17 Features: Fix the default C dialect for Clang and GNU.
49e2b689 Features: Fix references to CXX compiler version in Clang-C.cmake.
7565ab2c Features: Test the CXX compiler only if it has features.
Diffstat (limited to 'Tests/CMakeLists.txt')
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index ab28eca..c9d9568 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -292,11 +292,11 @@ if(BUILD_TESTING) endif() ADD_TEST_MACRO(SourcesProperty SourcesProperty) if(CMAKE_CXX_COMPILER_ID STREQUAL GNU - AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.6) + AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.7) set(runCxxDialectTest 1) endif() if(CMAKE_CXX_COMPILER_ID STREQUAL Clang - AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2.9) + AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.4) if(NOT APPLE OR POLICY CMP0025) set(runCxxDialectTest 1) endif() |