Skip to content

Commit 2cd4877

Browse files
committed
Attempt to solve b2 openssl problem in win
1 parent b41e270 commit 2cd4877

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Install dependencies
2626
run: choco install --no-progress -y openssl
27-
27+
2828
- name: Setup Boost
2929
run: python3 tools/ci.py setup-boost --source-dir=$(pwd)
3030

@@ -91,12 +91,17 @@ jobs:
9191
include:
9292
- { toolset: msvc-14.2, os: windows-2019 }
9393
- { toolset: msvc-14.3, os: windows-2022 }
94+
env:
95+
OPENSSL_ROOT: "C:\\Program Files\\OpenSSL-Win64"
9496
steps:
9597
- name: Checkout
9698
uses: actions/checkout@v3
9799

98100
- name: Install dependencies
99101
run: choco install --no-progress -y openssl
102+
103+
- name: Setup user-config.jam
104+
run: cp tools/user-config.jam "$USERPROFILE/"
100105

101106
- name: Setup Boost
102107
run: python3 tools/ci.py setup-boost --source-dir=$(pwd)

tools/user-config.jam

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Used on CI. This is required on Windows to make b2 find openssl
2+
3+
import os ;
4+
5+
local OPENSSL_ROOT = [ os.environ OPENSSL_ROOT ] ;
6+
7+
project
8+
: requirements
9+
<include>$(OPENSSL_ROOT)/include
10+
<variant>debug:<library-path>$(OPENSSL_ROOT)/lib
11+
<target-os>windows<variant>debug:<library-path>$(OPENSSL_ROOT)/debug/lib
12+
<variant>release:<library-path>$(OPENSSL_ROOT)/lib
13+
;

0 commit comments

Comments
 (0)