Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add dlldir installation directory for shared libraries #73

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

add dlldir installation directory for shared libraries #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ jobs:
cd tools\boost_install\test\${{matrix.lib}}
mkdir __build__ && cd __build__
cmake -DCMAKE_INSTALL_PREFIX=%GITHUB_WORKSPACE%\..\.local -DUSE_BOOST_PACKAGE=1 -DBoost_VERBOSE=ON ${{matrix.copts}} ..
PATH %PATH%;%GITHUB_WORKSPACE%\..\.local\lib;%GITHUB_WORKSPACE%\..\boost-root\stage\lib
PATH %PATH%;%GITHUB_WORKSPACE%\..\.local\bin;%GITHUB_WORKSPACE%\..\boost-root\stage\bin
cmake --build . --config Debug && cmake --build . --config Debug --target check
cmake --build . --config Release && cmake --build . --config Release --target check
cmake --build . --config MinSizeRel && cmake --build . --config MinSizeRel --target check
Expand Down
1 change: 1 addition & 0 deletions boost-install-dirs.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import path ;
import stage ;

stage.add-install-dir cmakedir : cmake : libdir ;
stage.add-install-dir dlldir : "" : libdir ;

# header-subdir

Expand Down
40 changes: 32 additions & 8 deletions boost-install.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,6 +1215,30 @@ rule install-subdir ( properties * )
return <location>(libdir)/$(r:E=) ;
}

rule os-dlldir ( properties * )
{
local loc = [ property.select <location> : $(properties) ] ;
if $(loc)
{
return $(loc) ;
}

local dll-dir = [ property.select <install-dlldir> : $(properties) ] ;
if $(dlldir) || [ option.get dlldir ]
{
return <location>(dlldir) ;
}

local os = [ property.select <target-os> : $(properties) ] ;
os = $(os:G=) ;
if $(os:E=x) in windows cygwin
{
return <location>(bindir) ;
}

return <location>(dlldir) ;
}

rule boost-install ( libraries * )
{
.debug boost-install $(libraries) ;
Expand Down Expand Up @@ -1243,16 +1267,9 @@ rule boost-install ( libraries * )
install install-libraries-static : $(libraries) : <location>(libdir) <install-dependencies>on <install-type>STATIC_LIB ;
$(p).mark-target-as-explicit install-libraries-static ;

alias install-libraries-shared : install-libraries-shared- ;
alias install-libraries-shared : install-libraries-shared-cygwin : <target-os>cygwin ;
install install-libraries-shared : $(libraries) : <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on <conditional>@boost-install%os-dlldir ;
$(p).mark-target-as-explicit install-libraries-shared ;

install install-libraries-shared- : $(libraries) : <location>(libdir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
$(p).mark-target-as-explicit install-libraries-shared- ;

install install-libraries-shared-cygwin : $(libraries) : <location>(bindir) <install-type>SHARED_LIB <install-type>PDB <install-dependencies>on <install-no-version-symlinks>on ;
$(p).mark-target-as-explicit install-libraries-shared-cygwin ;

install install-unprefixed-static : $(unprefixed) : <install-type>STATIC_LIB <conditional>@boost-install%install-subdir ;
$(p).mark-target-as-explicit install-unprefixed-static ;

Expand Down Expand Up @@ -1304,16 +1321,23 @@ if [ MATCH --prefix=(.*) : [ modules.peek : ARGV ] ]
option.set datadir : ;
option.set datarootdir : ;
option.set cmakedir : ;
option.set dlldir : ;
}
if [ MATCH --exec-prefix=(.*) : [ modules.peek : ARGV ] ]
{
option.set bindir : ;
option.set libdir : ;
option.set cmakedir : ;
option.set dlldir : ;
}
if [ MATCH --libdir-prefix=(.*) : [ modules.peek : ARGV ] ]
{
option.set cmakedir : ;
option.set dlldir : ;
}
if [ MATCH --bindir-prefix=(.*) : [ modules.peek : ARGV ] ]
{
option.set dlldir : ;
}
if [ MATCH --dataroot-prefix=(.*) : [ modules.peek : ARGV ] ]
{
Expand Down
Loading