diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2016-01-08 15:16:45 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-11 09:53:32 +0000 |
| commit | 1c32b71cd0ea6a05a4d328a7d30f19b49d0d67f1 (patch) | |
| tree | 363862e893505854887606e24343679a4e8ac5c5 /src/corelib | |
| parent | f186c4a819c209a63de4eb7329addaa6f4bde403 (diff) | |
CMake: Fix qt5_use_modules macro for CMake 2.8.11
Note the excessive escaping around "GNU".
Otherwise this leaks the -fPIE flag to the target.
Change-Id: I340df5d5bce00ebec4e1ff3a557ade67022ba23b
Reviewed-by: Stephen Kelly <ske@ableton.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/Qt5CoreMacros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index c441d3ad73..9fab04fb26 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -336,7 +336,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL QT_NO_DEBUG) if (Qt5_POSITION_INDEPENDENT_CODE AND (CMAKE_VERSION VERSION_LESS 2.8.12 - AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL \"GNU\" + AND (NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0))) set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE}) endif() |