diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:29:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-04 15:30:15 +0200 |
| commit | db2ecc45564609f940ff564e777f76a1a4b734d4 (patch) | |
| tree | d4756dffb486a2a1c64f13402bafd0327b7ddbb3 /Source/cmake/OptionsCommon.cmake | |
| parent | 8231f9776c2e4028937411bd2a0886aa72c97831 (diff) | |
| parent | d10511e0a3f655ab2b1dfebfd9c17ade151a7cfe (diff) | |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I006cd9023fadc5407bbaa2ddfda45cb8e88b548b
Diffstat (limited to 'Source/cmake/OptionsCommon.cmake')
| -rw-r--r-- | Source/cmake/OptionsCommon.cmake | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake index 4529bdd84..529e2bc0d 100644 --- a/Source/cmake/OptionsCommon.cmake +++ b/Source/cmake/OptionsCommon.cmake @@ -32,6 +32,10 @@ if (COMPILER_IS_GCC_OR_CLANG) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-exceptions -fno-strict-aliasing") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -fno-strict-aliasing -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + if (NOT (COMPILER_IS_CLANG AND "${CLANG_VERSION}" VERSION_LESS 4.0.0)) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-expansion-to-defined") + endif () endif () if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja") @@ -196,9 +200,9 @@ endif () # The Ninja generator does not yet know how to build archives in pieces, and so response # files must be used to deal with very long linker command lines. -# See https://bugs.webkit.org/show_bug.cgi?id=129771 -# The Apple Toolchain doesn't support response files. -if (NOT APPLE) +# CMake does this automatically, but the condition was wrong on Linux until CMake 3.2. +# See https://cmake.org/Bug/view.php?id=14892 +if ((CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND (CMAKE_VERSION VERSION_LESS 3.2)) set(CMAKE_NINJA_FORCE_RESPONSE_FILE 1) endif () |