From 2e24f9bb44c49f578932edac4a87fb8f919cef12 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 28 Dec 2024 22:23:27 -0600 Subject: [PATCH] updated build system --- cmake/libraries/curl.cmake | 7 +++++-- docker/x86_64/mingw64 | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/libraries/curl.cmake b/cmake/libraries/curl.cmake index f18b5208..17be921e 100644 --- a/cmake/libraries/curl.cmake +++ b/cmake/libraries/curl.cmake @@ -20,11 +20,13 @@ if(PROJECT_ENABLE_CURL) LIST_SEPARATOR | CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS} - -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} - -DBUILD_STATIC_LIBS=ON -DBUILD_CURL_EXE=OFF + -DBUILD_LIBCURL_DOCS=OFF + -DBUILD_MISC_DOCS=OFF + -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS} -DBUILD_STATIC_CURL=ON -DBUILD_STATIC_LIBS=ON + -DBUILD_STATIC_LIBS=ON -DBUILD_TESTING=OFF -DCURL_CA_BUNDLE=./cacert.pem -DCURL_CA_FALLBACK=ON @@ -33,6 +35,7 @@ if(PROJECT_ENABLE_CURL) -DCURL_USE_LIBSSH2=OFF -DCURL_USE_OPENSSL=${PROJECT_ENABLE_OPENSSL} -DCURL_ZLIB=ON + -DENABLE_CURL_MANUAL=OFF -DENABLE_THREADED_RESOLVER=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR} -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS} diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index 50eddf8f..3592d59e 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -671,6 +671,8 @@ RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \ && cd build \ && cmake .. \ -DBUILD_CURL_EXE=ON \ + -DBUILD_LIBCURL_DOCS=OFF \ + -DBUILD_MISC_DOCS=OFF \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_STATIC_LIBS=ON \ -DBUILD_TESTING=OFF \ @@ -684,6 +686,7 @@ RUN if [ -f "/3rd_party/curl-${MY_CURL_VERSION}.tar.gz" ]; then \ -DCURL_USE_LIBSSH2=OFF \ -DCURL_USE_OPENSSL=ON \ -DCURL_ZLIB=ON \ + -DENABLE_CURL_MANUAL=OFF \ -DENABLE_THREADED_RESOLVER=ON \ -DOPENSSL_USE_STATIC_LIBS=ON \ -DUSE_LIBIDN2=OFF \