From 7f26c9da9f2becd5c6711c7e45e04531e152be83 Mon Sep 17 00:00:00 2001 From: Remy Marquis Date: Sun, 3 Oct 2021 15:56:13 +0200 Subject: [PATCH] libs: use uniform syntax for cmake options Note the temporary difference for WolfSSL, to be fixed later --- CMakeLists.txt | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 722661af..e8d4fa6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,11 +50,13 @@ if(FEATURE_SSL AND BUNDLED_WOLFSSL) set(WOLFSSL_PATCH_COMMAND "${Patch_EXECUTABLE}" "${LIBS_DOWNLOAD_SRC_DIR}/wolfssl/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/patches/WolfSSL.patch") if(MSVC) - set(WOLFSSL_FLAGS "${CMAKE_C_FLAGS} /DOPENSSL_ALL=1 /DOPENSSL_EXTRA=1 /DHAVE_OCSP=1 /DHAVE_CRL=1") + set(WOLFSSL_FLAGS "${CMAKE_C_FLAGS} /DOPENSSL_ALL=ON /DOPENSSL_EXTRA=ON /DHAVE_OCSP=ON /DHAVE_CRL=ON") else() - set(WOLFSSL_FLAGS "${CMAKE_C_FLAGS} -DOPENSSL_ALL=1 -DOPENSSL_EXTRA=1 -DHAVE_OCSP=1 -DHAVE_CRL=1") + set(WOLFSSL_FLAGS "${CMAKE_C_FLAGS} -DOPENSSL_ALL=ON -DOPENSSL_EXTRA=ON -DHAVE_OCSP=ON -DHAVE_CRL=ON") endif() + # FIXME: change lowercase 'yes/no' variables to 'ON/OFF' for uniformization once a new WolfSSL is released + # see https://github.com/wolfSSL/wolfssl/issues/4426 ExternalProject_Add(bundled_wolfssl DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR} URL https://github.com/wolfSSL/wolfssl/archive/v4.8.1-stable.tar.gz @@ -151,16 +153,16 @@ if(WIN32) set(CURL_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} - -DBUILD_CURL_EXE=0 -DBUILD_SHARED_LIBS=0 -DENABLE_ARES=0 -DENABLE_THREADED_RESOLVER=1 -DENABLE_DEBUG=0 - -DENABLE_CURLDEBUG=0 -DBUILD_TESTING=0 -DENABLE_IPV6=1 -DENABLE_MANUAL=0 -DCMAKE_USE_LIBSSH2=0 - -DUSE_NGHTTP2=0 -DCURL_WINDOWS_SSPI=0 -DCURL_ZLIB=AUTO -DCMAKE_USE_GSSAPI=0 - -DCURL_DISABLE_LDAP=1 -DCURL_DISABLE_LDAPS=1 -DCURL_DISABLE_TELNET=1 -DCURL_DISABLE_DICT=1 - -DCURL_DISABLE_FILE=1 -DCURL_DISABLE_TFTP=1 -DCURL_DISABLE_RTSP=1 -DCURL_DISABLE_POP3=1 - -DCURL_DISABLE_IMAP=1 -DCURL_DISABLE_SMTP=1 -DCURL_DISABLE_GOPHER=1 -DENABLE_UNIX_SOCKETS=1 + -DBUILD_CURL_EXE=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_ARES=OFF -DENABLE_THREADED_RESOLVER=ON -DENABLE_DEBUG=OFF + -DENABLE_CURLDEBUG=OFF -DBUILD_TESTING=OFF -DENABLE_IPV6=ON -DENABLE_MANUAL=OFF -DCMAKE_USE_LIBSSH2=OFF + -DUSE_NGHTTP2=OFF -DCURL_WINDOWS_SSPI=OFF -DCURL_ZLIB=AUTO -DCMAKE_USE_GSSAPI=OFF + -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON -DCURL_DISABLE_TELNET=ON -DCURL_DISABLE_DICT=ON + -DCURL_DISABLE_FILE=ON -DCURL_DISABLE_TFTP=ON -DCURL_DISABLE_RTSP=ON -DCURL_DISABLE_POP3=ON + -DCURL_DISABLE_IMAP=ON -DCURL_DISABLE_SMTP=ON -DCURL_DISABLE_GOPHER=ON -DENABLE_UNIX_SOCKETS=ON -DCMAKE_INSTALL_PREFIX=${LIBS_BINARY_DIR}/curl) if(MSVC) - list(APPEND CURL_CMAKE_ARGS -DCURL_STATIC_CRT=1) + list(APPEND CURL_CMAKE_ARGS -DCURL_STATIC_CRT=ON) endif() if(FEATURE_SSL) @@ -184,7 +186,7 @@ if(WIN32) list(APPEND CURL_CMAKE_ARGS -DCMAKE_USE_OPENSSL=OFF) endif() - # -DHTTP_ONLY=1 + # -DHTTP_ONLY=ON ExternalProject_Add(bundled_curl DEPENDS bundled_wolfssl bundled_openssl DOWNLOAD_DIR ${LIBS_DOWNLOAD_DIR} @@ -383,9 +385,9 @@ if(WIN32) CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/openal - -DLIBTYPE=STATIC -DFORCE_STATIC_VCRT=1 - -DALSOFT_UTILS=0 -DALSOFT_NO_CONFIG_UTIL=1 -DALSOFT_EXAMPLES=0 -DALSOFT_TESTS=0 - -DALSOFT_CONFIG=0 -DALSOFT_HRTF_DEFS=0 -DALSOFT_AMBDEC_PRESETS=0 + -DLIBTYPE=STATIC -DFORCE_STATIC_VCRT=ON + -DALSOFT_UTILS=OFF -DALSOFT_NO_CONFIG_UTIL=ON -DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF + -DALSOFT_CONFIG=OFF -DALSOFT_HRTF_DEFS=OFF -DALSOFT_AMBDEC_PRESETS=OFF INSTALL_COMMAND "" ) @@ -641,8 +643,8 @@ elseif(UNIX) -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/openal -DCMAKE_OSX_DEPLOYMENT_TARGET="${CMAKE_OSX_DEPLOYMENT_TARGET}" -DLIBTYPE=STATIC - -DALSOFT_UTILS=0 -DALSOFT_NO_CONFIG_UTIL=1 -DALSOFT_EXAMPLES=0 -DALSOFT_TESTS=0 - -DALSOFT_CONFIG=0 -DALSOFT_HRTF_DEFS=0 -DALSOFT_AMBDEC_PRESETS=0 -DALSOFT_BACKEND_SNDIO=OFF + -DALSOFT_UTILS=OFF -DALSOFT_NO_CONFIG_UTIL=ON -DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF + -DALSOFT_CONFIG=OFF -DALSOFT_HRTF_DEFS=OFF -DALSOFT_AMBDEC_PRESETS=OFF -DALSOFT_BACKEND_SNDIO=OFF INSTALL_COMMAND "" )