Skip to content

SConstruct : Added BOOST_CMAKE option to support Boost that was built with CMake. #1494

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

Open
wants to merge 1 commit into
base: RB-10.6
Choose a base branch
from
Open

SConstruct : Added BOOST_CMAKE option to support Boost that was built with CMake. #1494

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
5 changes: 5 additions & 0 deletions Changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
10.6.x.x (relative to 10.6.0.1)
========

Build
-----

- SConstruct : Added `BOOST_CMAKE` option to support Boost that was built with CMake.

API
---

Expand Down
9 changes: 6 additions & 3 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,10 @@ o.Add(
"likely related to the specific python version.",
)

o.Add(
BoolVariable( "BOOST_CMAKE", "Enable this if Boost was built with CMake", False )
)

# OpenEXR options

o.Add(
Expand Down Expand Up @@ -1090,16 +1094,15 @@ if doConfigure :

env.Append( LIBS = [
"boost_filesystem" + env["BOOST_LIB_SUFFIX"],
"boost_regex" + env["BOOST_LIB_SUFFIX"],
"boost_iostreams" + env["BOOST_LIB_SUFFIX"],
"boost_date_time" + env["BOOST_LIB_SUFFIX"],
"boost_thread" + env["BOOST_LIB_SUFFIX"],
"boost_timer" + env["BOOST_LIB_SUFFIX"],
"boost_chrono" + env["BOOST_LIB_SUFFIX"]
]
] + ["boost_regex" + env["BOOST_LIB_SUFFIX"]] if not env["BOOST_CMAKE"] else []
)

if int( env["BOOST_MINOR_VERSION"] ) >=35 :
if int( env["BOOST_MINOR_VERSION"] ) >=35 and not env["BOOST_CMAKE"] :
env.Append( LIBS = [ "boost_system" + env["BOOST_LIB_SUFFIX"] ] )

c = configureSharedLibrary( env )
Expand Down