Skip to content

Commit f37f06f

Browse files
authored
cURL VS build paths (#542)
* cURL pem * cURL pem to src folder (cherry picked from commit 8abb9d2) * vs realpath
1 parent 5a872bd commit f37f06f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

apothecary/formulas/curl/curl.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ function download() {
4040
rm curl*.tar.gz
4141

4242
curl -LO https://curl.se/ca/cacert.pem
43+
cp cacert.pem curl/src/cacert.pem
4344
mv cacert.pem curl/cacert.pem
4445

4546
}
@@ -94,6 +95,7 @@ function build() {
9495
local CACERT_PATH="./cacert.pem"
9596

9697
if [ "$TYPE" == "vs" ]; then
98+
local CACERT_PATH=$(realpath "./cacert.pem")
9799
export OPENSSL_LIBRARIES=$OF_LIBS_OPENSSL_ABS_PATH/lib/$TYPE/$PLATFORM
98100
export OPENSSL_WINDOWS_PATH=$(cygpath -w ${OF_LIBS_OPENSSL_ABS_PATH} | sed "s/\\\/\\\\\\\\/g")
99101

@@ -105,8 +107,11 @@ function build() {
105107
GENERATOR_NAME="Visual Studio ${VS_VER_GEN}"
106108
mkdir -p "build_${TYPE}_${ARCH}"
107109
cd "build_${TYPE}_${ARCH}"
110+
cp ../cacert.pem ./cacert.pem
108111
rm -f CMakeCache.txt *.a *.o *.lib
109112

113+
114+
110115
OPENSSL_ROOT="$LIBS_ROOT/openssl/"
111116
OPENSSL_INCLUDE_DIR="$LIBS_ROOT/openssl/include"
112117
OPENSSL_LIBRARY="$LIBS_ROOT/zlib/lib/$TYPE/$PLATFORM/openssl.lib"

0 commit comments

Comments
 (0)