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 /CMakeLists.txt | |
| parent | 38fd8c0e227bc3475627f4698c6ebc37777ed4a9 (diff) | |
Cycles: more linux build system tweaks, attempting to avoid using boost
system libraries by default if we have a lib/ directory.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 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() |