diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-11-20 21:11:56 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-11-20 21:11:56 (GMT) |
| commit | f327a9fd26a24b2aaf609a9b3d34258c7a992bb3 (patch) | |
| tree | 1faa112e68297c548c8512f3162eda4b8b990e8a /Tests/CMakeLists.txt | |
| parent | 3a20cef3d71ab55c77aa85b05217e13afabb35b4 (diff) | |
| parent | 36bb100e2b4e5586cecb0dc4e4488b3e8dd18f69 (diff) | |
| download | CMake-f327a9fd26a24b2aaf609a9b3d34258c7a992bb3.zip CMake-f327a9fd26a24b2aaf609a9b3d34258c7a992bb3.tar.gz CMake-f327a9fd26a24b2aaf609a9b3d34258c7a992bb3.tar.bz2 | |
Merge branch 'default-lang-dialect' into step2
Conflicts:
Modules/Compiler/Clang-C.cmake
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 3e29683..5c06156 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() |