From b7b4f8f449e43e9ea7b6c0d387ec34c54fe41cb4 Mon Sep 17 00:00:00 2001 From: Ruben Perez Date: Thu, 5 Oct 2023 12:02:31 +0200 Subject: [PATCH] OpenSSL win fix in CI --- .github/workflows/ci.yml | 2 +- tools/user-config.jam | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa0aac24..0ded3df7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,7 +101,7 @@ jobs: run: choco install --no-progress -y openssl - name: Setup user-config.jam - run: cp tools/user-config.jam "$USERPROFILE/" + run: cp tools/user-config.jam "${HOMEDRIVE}${HOMEPATH}/" - name: Setup Boost run: python3 tools/ci.py setup-boost --source-dir=$(pwd) diff --git a/tools/user-config.jam b/tools/user-config.jam index 7abffad7..91fc619e 100644 --- a/tools/user-config.jam +++ b/tools/user-config.jam @@ -4,10 +4,9 @@ import os ; local OPENSSL_ROOT = [ os.environ OPENSSL_ROOT ] ; -project - : requirements +using openssl : : $(OPENSSL_ROOT)/include - debug:$(OPENSSL_ROOT)/lib - windowsdebug:$(OPENSSL_ROOT)/debug/lib - release:$(OPENSSL_ROOT)/lib - ; + $(OPENSSL_ROOT)/lib + libssl + libcrypto +;