diff options
| author | don bright <hugh.m.bright@gmail.com> | 2011-12-07 06:36:33 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2011-12-07 06:36:33 (GMT) |
| commit | 9a665075c9df74fd646ad187636bc242a9a8816c (patch) | |
| tree | 17da2a181e9031bb5309aee32018d1fd86a2f807 /tests/CMakeLists.txt | |
| parent | 462a4f4f44543d89be829eac6bb64a33854a4dd9 (diff) | |
update FindBoost from cmake git. improve crash handling + boost finding
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 04be773..e668db3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -71,14 +71,24 @@ if (NOT $ENV{MACOSX_DEPLOY_DIR} STREQUAL "") set(BOOST_ROOT "$ENV{MACOSX_DEPLOY_DIR}") endif() +if (NOT $ENV{BOOST_DIR} STREQUAL "") + set(BOOST_DIR "$ENV{BOOST_DIR}") +endif() + +if (NOT ${BOOST_DIR} STREQUAL "") + set(BOOST_ROOT ${BOOST_DIR}) + message(STATUS "BOOST_ROOT: " ${BOOST_ROOT}) + set(Boost_NO_SYSTEM_PATHS "TRUE") + set(Boost_DEBUG TRUE) +endif() + + if (WIN32) set(Boost_USE_STATIC_LIBS TRUE) set(BOOST_STATIC TRUE) set(BOOST_THREAD_USE_LIB TRUE) endif() -#set(Boost_DEBUG TRUE) -set(Boost_NO_SYSTEM_PATHS TRUE) set(Boost_ADDITIONAL_VERSIONS "1.47.0" "1.46.0") find_package( Boost 1.35.0 COMPONENTS thread program_options ) if(Boost_FOUND) |