Skip to content

Commit

Permalink
Merge pull request #643 from evo-lua/libcurl-openssl-flags
Browse files Browse the repository at this point in the history 
Correct the OPENSSL_ROOT_DIR used when building curl
  • Loading branch information
@rdw-software
rdw-software authored Jan 15, 2025
2 parents e2199c4 + 9d3dd16 commit 673aea3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions deps/curl-unixbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ BUILD_DIR=$SRC_DIR/cmakebuild-unix
OUT_DIR=$(pwd)/ninjabuild-unix

# Enabled features: OpenSSL and zlib are essential and already included, anyway
OPENSSL_DIR=$(pwd)/deps/openssl/openssl
OPENSSL_INCLUDE_DIR=$OPENSSL_DIR/include
OPENSSL_DIR=$OUT_DIR
OPENSSL_INCLUDE_DIR=$(pwd)/deps/openssl/openssl/include
STATIC_OPENSSL_FLAGS="-DCURL_USE_OPENSSL=ON -DOPENSSL_INCLUDE_DIR=$OPENSSL_INCLUDE_DIR -DOPENSSL_USE_STATIC_LIBS=ON -DOPENSSL_ROOT_DIR=$OPENSSL_DIR"

ZLIB_INCLUDE_DIR=$(pwd)/deps/madler/zlib # Only required for wolfSSL - but better safe than sorry?
Expand Down
4 changes: 2 additions & 2 deletions deps/curl-windowsbuild.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ BUILD_DIR=$SRC_DIR/cmakebuild-windows
OUT_DIR=$(pwd)/ninjabuild-windows

# Enabled features: OpenSSL and zlib are essential and already included, anyway
OPENSSL_DIR=$(pwd)/deps/openssl/openssl
OPENSSL_INCLUDE_DIR=$OPENSSL_DIR/include
OPENSSL_DIR=$OUT_DIR
OPENSSL_INCLUDE_DIR=$(pwd)/deps/openssl/openssl/include
STATIC_OPENSSL_FLAGS="-DCURL_USE_OPENSSL=ON -DOPENSSL_INCLUDE_DIR=$OPENSSL_INCLUDE_DIR -DOPENSSL_USE_STATIC_LIBS=ON -DOPENSSL_ROOT_DIR=$OPENSSL_DIR"

ZLIB_INCLUDE_DIR=$(pwd)/deps/madler/zlib # Only required for wolfSSL - but better safe than sorry?
Expand Down

0 comments on commit 673aea3

Please sign in to comment.