diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-12 00:57:00 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-12 00:57:00 +0400 |
| commit | 0f85990d4adf648dcb79b2196116191583011de3 (patch) | |
| tree | 5e06aafb9c70498e2435125aee7c9ab3fe302eda | |
| parent | 38fd8c0e227bc3475627f4698c6ebc37777ed4a9 (diff) | |
Cycles: more linux build system tweaks, attempting to avoid using boost
system libraries by default if we have a lib/ directory.
| -rw-r--r-- | CMakeLists.txt | 13 | ||||
| -rw-r--r-- | build_files/scons/config/linux-config.py | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 14ac05bf6c1..36ef022f3c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -524,14 +524,15 @@ if(UNIX AND NOT APPLE) endif() if(WITH_BOOST) - # use lib dir if available and nothing else specified - if(LIBDIR AND NOT BOOST_ROOT) - set(BOOST_ROOT ${LIBDIR}/boost) - endif() - # uses in build instructions to override include and library variables if(NOT BOOST_CUSTOM) - set(Boost_USE_MULTITHREADED ON) + # use lib dir if available and nothing else specified + if(LIBDIR AND NOT BOOST_ROOT) + set(BOOST_ROOT ${LIBDIR}/boost) + set(Boost_USE_MULTITHREADED OFF) + else() + set(Boost_USE_MULTITHREADED ON) + endif() find_package(Boost 1.34 COMPONENTS filesystem regex system thread) mark_as_advanced(Boost_DIR) # why doesnt boost do this? endif() diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 7644259d390..655054706f5 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -211,7 +211,7 @@ if not os.path.exists(LCGDIR + '/boost'): WITH_BF_BOOST = False BF_BOOST = '/usr' BF_BOOST_INC = BF_BOOST + '/include' -BF_BOOST_LIB = 'boost_date_time-mt boost_filesystem-mt boost_regex-mt boost_system-mt boost_thread-mt' +BF_BOOST_LIB = 'boost_date_time boost_filesystem boost_regex boost_system boost_thread' BF_BOOST_LIBPATH = BF_BOOST + '/lib' WITH_BF_CYCLES = WITH_BF_OIIO and WITH_BF_BOOST |