Skip to content

Commit 526a903

Browse files
committed
Add --libdir, more --stagedir, --stage-libdir tests to ci.yml
1 parent 4be1e57 commit 526a903

1 file changed

Lines changed: 34 additions & 0 deletions

File tree

.github/workflows/ci.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,20 @@ jobs:
157157
copts: -DBoost_USE_MULTITHREADED=OFF
158158
os: ubuntu-latest
159159

160+
# libdir, default cmakedir
161+
162+
- lib: filesystem
163+
bopts: --libdir=$HOME/install-libdir install
164+
copts: -DBoost_ROOT=$HOME/install-libdir
165+
os: ubuntu-latest
166+
167+
# libdir, cmakedir
168+
169+
- lib: filesystem
170+
bopts: --libdir=$HOME/install-libdir --cmakedir=$HOME/install-cmakedir install
171+
copts: -DBoost_ROOT=$HOME/install-cmakedir
172+
os: ubuntu-latest
173+
160174
# staged
161175

162176
- lib: filesystem
@@ -412,6 +426,16 @@ jobs:
412426
copts: -DBoost_USE_STATIC_LIBS=ON
413427
os: windows-latest
414428

429+
- lib: filesystem
430+
bopts: --libdir=%GITHUB_WORKSPACE%\..\libdir install
431+
copts: -DBoost_ROOT=%GITHUB_WORKSPACE%\..\libdir
432+
os: windows-latest
433+
434+
- lib: filesystem
435+
bopts: --libdir=%GITHUB_WORKSPACE%\..\libdir --cmakedir=%GITHUB_WORKSPACE%\..\cmakedir install
436+
copts: -DBoost_ROOT=%GITHUB_WORKSPACE%\..\cmakedir
437+
os: windows-latest
438+
415439
# stage
416440

417441
- lib: filesystem
@@ -439,6 +463,16 @@ jobs:
439463
copts: -DUSE_STAGED_BOOST=ON -DBoost_USE_STATIC_LIBS=ON
440464
os: windows-latest
441465

466+
- lib: filesystem
467+
bopts: --stagedir=stage64-msvc stage
468+
copts: -DUSE_STAGED_BOOST=ON -DBoost_ROOT=%GITHUB_WORKSPACE%\..\boost-root\stage64-msvc\lib
469+
os: windows-latest
470+
471+
- lib: filesystem
472+
bopts: --stage-libdir=lib64-msvc stage
473+
copts: -DUSE_STAGED_BOOST=ON -DBoost_ROOT=%GITHUB_WORKSPACE%\..\boost-root\lib64-msvc
474+
os: windows-latest
475+
442476
# mingw
443477

444478
- lib: filesystem

0 commit comments

Comments
 (0)