diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-09 01:40:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-09 01:40:08 +0400 |
| commit | 262ac7340e79ce1fd3a902ce6121426837c6a316 (patch) | |
| tree | 6124d6e9cbef8f2393be050dce200540c099ee17 /CMakeLists.txt | |
| parent | af867438fc08e49014888b9bc2261a8193f4f10e (diff) | |
Cycles: cmake tweaks for linux build, instructions on the wiki no longer worked.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 21f5ffb2f47..6b26d99c9bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -503,18 +503,11 @@ if(UNIX AND NOT APPLE) if(WITH_BOOST) - # not sure this is needed, commenting, campbell - # --- - # set(BOOST "/usr" CACHE PATH "Boost Directory") - # - # if(NOT BOOST_CUSTOM) - # set(BOOST_ROOT ${BOOST}) - # set(Boost_USE_MULTITHREADED ON) - # find_package(Boost 1.34 COMPONENTS filesystem regex system thread) - # endif() - - set(Boost_USE_MULTITHREADED ON) - find_package(Boost 1.34 COMPONENTS filesystem regex system thread) + # uses in build instructions to override include and library variables + if(NOT BOOST_CUSTOM) + set(Boost_USE_MULTITHREADED ON) + find_package(Boost 1.34 COMPONENTS filesystem regex system thread) + endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) set(BOOST_LIBRARIES ${Boost_LIBRARIES}) |