diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-13 12:46:07 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-12-13 12:46:07 +0400 |
| commit | 6e038ff3988e12f52a8f8478d2eb67497f6bf87f (patch) | |
| tree | 4076f62b8747b64be431d5dc3fa8686bf72f9eb8 /CMakeLists.txt | |
| parent | 5d520c2b5a16cf7d86d4ed001857ced2ded8f8e7 (diff) | |
CMake: on linux, make boost now always require multithreaded libs, disabling
this was a hack for the precompiled libs in svn. Also bumped minimum version
to 1.48 because that's the first version that contains boost::locale.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b9fafdf514..674e532ff2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -644,20 +644,15 @@ if(UNIX AND NOT APPLE) if(WITH_BOOST) # uses in build instructions to override include and library variables if(NOT BOOST_CUSTOM) - # XXX No more lib dir, is this multithread stuff still needed? if(${WITH_STATIC_LIBS}) set(Boost_USE_STATIC_LIBS ON) endif() - if(NOT BOOST_ROOT) - set(Boost_USE_MULTITHREADED OFF) - else() - set(Boost_USE_MULTITHREADED ON) - endif() + set(Boost_USE_MULTITHREADED ON) set(__boost_packages filesystem regex system thread date_time) if (WITH_INTERNATIONAL) list(APPEND __boost_packages locale) endif() - find_package(Boost 1.34 COMPONENTS ${__boost_packages}) + find_package(Boost 1.48 COMPONENTS ${__boost_packages}) if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU) find_package(IcuLinux) endif() |