From 72d822f3583f67252fed8544b76f8501cda7531f Mon Sep 17 00:00:00 2001 From: Weng Xuetian Date: Wed, 11 Nov 2015 16:13:33 -0800 Subject: [PATCH 1/1] Fix SSL detection CMAKE_POSITION_INDEPENDENT_CODE will always append fPIE flag as last compiler flag when calling try_compile which makes check_cxx_source_compiles fails. Move the SSL check before set CMAKE_POSITION_INDEPENDENT_CODE and append Qt5Core_EXECUTABLE_COMPILE_FLAGS to CMAKE_CXX_FLAGS solve the problem. --- CMakeLists.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3caf61ec..0b1d3e5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -420,6 +420,20 @@ if (NOT WIN32) ) endif() +# Check for SSL support in Qt +# As there's no easy way to get Qt's configuration in particular for Qt5, let's just compile +# a small test program checking the defines. This works for both Qt4 and Qt5. +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}") +check_cxx_source_compiles(" + #include \"qglobal.h\" + #if defined QT_NO_OPENSSL || defined QT_NO_SSL + # error \"No SSL support\" + #endif + int main() {}" + HAVE_SSL) +cmake_pop_check_state() # Additional compile settings ##################################################################### @@ -483,20 +497,6 @@ if (NOT ZLIB_FOUND) endif() endif() -# Check for SSL support in Qt -# As there's no easy way to get Qt's configuration in particular for Qt5, let's just compile -# a small test program checking the defines. This works for both Qt4 and Qt5. -cmake_push_check_state(RESET) -set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) -check_cxx_source_compiles(" - #include \"qglobal.h\" - #if defined QT_NO_OPENSSL || defined QT_NO_SSL - # error \"No SSL support\" - #endif - int main() {}" - HAVE_SSL) -cmake_pop_check_state() - if (HAVE_SSL) add_definitions(-DHAVE_SSL) endif() -- 2.20.1