From 3fba22a7f7ecbd25a20de9a192c5c3e9c17fcf2a Mon Sep 17 00:00:00 2001 From: Iru Cai Date: Sat, 29 Oct 2016 15:01:04 +0800 Subject: only link crypto library instead of linking ssl and crypto --- CMakeLists.txt.freebsd | 2 +- CMakeLists.txt.linux | 3 +-- CMakeLists.txt.macos | 3 +-- CMakeLists.txt.mingw | 9 +-------- CMakeLists.txt.win32 | 2 +- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt.freebsd b/CMakeLists.txt.freebsd index e8c1317..871ef1c 100644 --- a/CMakeLists.txt.freebsd +++ b/CMakeLists.txt.freebsd @@ -41,7 +41,7 @@ target_link_libraries(fqterm.bin ${QT_QTSCRIPT_LIBRARIES} ${QT_LIBRARIES} ${QT_QTXML_LIBRARIES} - ${OPENSSL_LIBRARIES} + ${OPENSSL_CRYPTO_LIBRARY} ${PYTHON_LIB} ) diff --git a/CMakeLists.txt.linux b/CMakeLists.txt.linux index 1535dc5..6a08e43 100644 --- a/CMakeLists.txt.linux +++ b/CMakeLists.txt.linux @@ -77,10 +77,9 @@ target_link_libraries(fqterm.bin ${QT_QTSCRIPT_LIBRARIES} ${FQ_QT_STATIC_PLUGINS} ${QT_LIBRARIES} - ${OPENSSL_LIBRARIES} ${AUDIO_LIBRARY} ${PYTHON_LIB} - crypto + ${OPENSSL_CRYPTO_LIBRARY} X11 ) diff --git a/CMakeLists.txt.macos b/CMakeLists.txt.macos index a192b92..f8f7291 100644 --- a/CMakeLists.txt.macos +++ b/CMakeLists.txt.macos @@ -61,8 +61,7 @@ target_link_libraries(fqterm ${PYTHON_LIB} ${ZLIB_LIBRARIES} ${QT_QTXML_LIBRARIES} - ssl - crypto + ${OPENSSL_CRYPTO_LIBRARY} ) add_dependencies(fqterm diff --git a/CMakeLists.txt.mingw b/CMakeLists.txt.mingw index b0fc8c1..11ba502 100644 --- a/CMakeLists.txt.mingw +++ b/CMakeLists.txt.mingw @@ -35,13 +35,6 @@ if(FQTERM_USE_STATIC_QT) set(FQ_QT_STATIC_PLUGINS qcncodecs qjpcodecs qkrcodecs qtwcodecs ) - set(OPENSSL_LINK_LIBS - crypto ssl - ) -else(FQTERM_USE_STATIC_QT) - set(OPENSSL_LINK_LIBS - ${OPENSSL_LIBS} - ) endif(FQTERM_USE_STATIC_QT) target_link_libraries(fqterm @@ -52,7 +45,7 @@ target_link_libraries(fqterm ${FQ_QT_STATIC_PLUGINS} ${QT_LIBRARIES} ${PYTHON_LIB} - ${OPENSSL_LINK_LIBS} + ${OPENSSL_CRYPTO_LIBRARY} ws2_32 ) diff --git a/CMakeLists.txt.win32 b/CMakeLists.txt.win32 index 53338dc..e910440 100644 --- a/CMakeLists.txt.win32 +++ b/CMakeLists.txt.win32 @@ -67,7 +67,7 @@ target_link_libraries(fqterm ${QT_QTNETWORK_LIBRARIES} ${QT_QTSCRIPT_LIBRARIES} ${QT_QTXML_LIBRARIES} - ${OPENSSL_LIBRARIES} + ${OPENSSL_CRYPTO_LIBRARY} ${FQ_QT_STATIC_PLUGINS} ${PYTHON_LIB} ${SOUND_LIBRARIES} -- cgit v1.2.3