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

simplify Jamfile #2

Open
wants to merge 4 commits into
base: bump_boost_json
Choose a base branch
from
Open

simplify Jamfile #2

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
790fa41
Increase minimum required Boost version to 1.75
FranciscoPombal Dec 14, 2020
21ef4a4
Use header-only Boost.JSON from Boost >= 1.75
FranciscoPombal Dec 14, 2020
db7b329
Remove no longer required deps/json submodule
FranciscoPombal Dec 14, 2020
b79ce49
simplify Jamfile
arvidn Dec 15, 2020
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
Prev Previous commit
simplify Jamfile
  • Loading branch information
@arvidn
arvidn committed Dec 15, 2020
commit b79ce498990fbe2709163fcc1901decd9ae68284
24 changes: 2 additions & 22 deletions bindings/python/Jamfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ if $(BOOST_ROOT)
{
use-project /boost : $(BOOST_ROOT) ;
alias boost_python : /boost/python//boost_python : : : <include>$(BOOST_ROOT) ;
alias boost_python3 : boost_python ;
}
else
{
Expand Down Expand Up @@ -68,7 +67,6 @@ else
}

lib boost_python : : <tag>@boost_python_version : : $(boost-include-path) ;
alias boost_python3 : boost_python ;
}


Expand Down Expand Up @@ -103,30 +101,13 @@ rule libtorrent_linking ( properties * )
ECHO "WARNING: you probably want to specify libtorrent-link=static rather than link=static" ;
}

local boost_python_lib ;

for local prop in $(properties)
{
switch $(prop)
{
case <python>2.* : boost_python_lib = boost_python ;
case <python>3.* : boost_python_lib = boost_python3 ;
}
}

if ! $(boost_python_lib)
{
ECHO "WARNING: unknown python version" ;
boost_python_lib = boost_python ;
}

if <boost-link>shared in $(properties)
{
result += <library>$(boost_python_lib)/<link>shared/<warnings>off ;
result += <library>boost_python/<link>shared/<warnings>off ;
}
else
{
result += <library>$(boost_python_lib)/<link>static/<warnings>off ;
result += <library>boost_python/<link>static/<warnings>off ;
}

if <libtorrent-link>shared in $(properties)
Expand Down Expand Up @@ -255,7 +236,6 @@ install stage_module
install stage_dependencies
: /torrent//torrent
boost_python
boost_python3
: <location>dependencies
<install-dependencies>on
<install-type>SHARED_LIB
Expand Down