projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bbe4e00
)
Fix the SSL check with Qt 5.6 and GCC 5 (#199)
author
martin
<martin.sandsmark@kde.org>
Mon, 6 Jun 2016 22:37:22 +0000
(
00:37
+0200)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Wed, 28 Feb 2018 22:03:21 +0000
(23:03 +0100)
(cherry picked from commit
4768c9e99f99b581d4e32e797db91d0182391696
)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
7c2389f
..
831dabf
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-433,6
+433,11
@@
endif()
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+
+if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE)
+ set(CMAKE_REQUIRED_FLAGS "-fPIC -DQT_NO_VERSION_TAGGING")
+endif()
+
check_cxx_source_compiles("
#include \"qglobal.h\"
#if defined QT_NO_SSL