From 2cd487784b2da8f70b35ad5dfc47d7228ccdc3d2 Mon Sep 17 00:00:00 2001 From: Ruben Perez Date: Wed, 4 Oct 2023 18:58:07 +0200 Subject: [PATCH] Attempt to solve b2 openssl problem in win --- .github/workflows/ci.yml | 7 ++++++- tools/user-config.jam | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 tools/user-config.jam diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a2d480e..5b8aad9c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: Install dependencies run: choco install --no-progress -y openssl - + - name: Setup Boost run: python3 tools/ci.py setup-boost --source-dir=$(pwd) @@ -91,12 +91,17 @@ jobs: include: - { toolset: msvc-14.2, os: windows-2019 } - { toolset: msvc-14.3, os: windows-2022 } + env: + OPENSSL_ROOT: "C:\\Program Files\\OpenSSL-Win64" steps: - name: Checkout uses: actions/checkout@v3 - name: Install dependencies run: choco install --no-progress -y openssl + + - name: Setup user-config.jam + run: cp tools/user-config.jam "$USERPROFILE/" - 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 new file mode 100644 index 00000000..7abffad7 --- /dev/null +++ b/tools/user-config.jam @@ -0,0 +1,13 @@ +# Used on CI. This is required on Windows to make b2 find openssl + +import os ; + +local OPENSSL_ROOT = [ os.environ OPENSSL_ROOT ] ; + +project + : requirements + $(OPENSSL_ROOT)/include + debug:$(OPENSSL_ROOT)/lib + windowsdebug:$(OPENSSL_ROOT)/debug/lib + release:$(OPENSSL_ROOT)/lib + ;