From 3de83303e1bb6e062f70a95352457de15fcf96a0 Mon Sep 17 00:00:00 2001 From: kakwa Date: Sat, 4 Nov 2017 14:10:41 +0100 Subject: [PATCH] use openssl dynamic loading for civetweb --- CMakeLists.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f2bef5..812ad5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,10 @@ IF(STATIC) set(CIVETWEB_USE_STATIC_LIBS ON) ENDIF(STATIC) +IF(BUNDLE_CIVETWEB) + set(DL_LIBRARIES 'dl') +ENDIF(BUNDLE_CIVETWEB) + IF(LINK_DL) set(DL_LIBRARIES 'dl') ENDIF(LINK_DL) @@ -114,7 +118,6 @@ if(BUNDLE_CIVETWEB) CMAKE_ARGS .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_C_FLAGS="-Wno-incompatible-pointer-types" -DCIVETWEB_ENABLE_CXX=OFF -DBUILD_SHARED_LIBS=OFF -DCIVETWEB_DISABLE_CGI=ON @@ -124,7 +127,7 @@ if(BUNDLE_CIVETWEB) -DBUILD_TESTING=OFF -DCIVETWEB_SSL_OPENSSL_API_1_1=${OPENSSL_API_1_1} -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS} - -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=OFF + -DCIVETWEB_ENABLE_SSL_DYNAMIC_LOADING=ON -DCIVETWEB_ALLOW_WARNINGS=ON ${CIVETWEB_CUST_ARGS} INSTALL_COMMAND make install DESTDIR=${CMAKE_CURRENT_SOURCE_DIR}/vendor/