diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2016-10-13 08:17:53 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-13 14:19:07 (GMT) |
| commit | 08b9a0fdfa02f50e6ae2aeca1963e8f47d041dd2 (patch) | |
| tree | 606821d2e5a722dad320ac683873682deb2fc44a /Modules | |
| parent | ca4029fa9aada8e5d86eb81cc5ef9c7e9efe7715 (diff) | |
| download | CMake-08b9a0fdfa02f50e6ae2aeca1963e8f47d041dd2.zip CMake-08b9a0fdfa02f50e6ae2aeca1963e8f47d041dd2.tar.gz CMake-08b9a0fdfa02f50e6ae2aeca1963e8f47d041dd2.tar.bz2 | |
FindBoost: Simplify library dir detection with cascading if/elseif/else
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBoost.cmake | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 6976038..9bd7a30 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -1681,13 +1681,11 @@ if(Boost_FOUND) endif() if(EXISTS "${_boost_LIB_DIR}/lib") - set(_boost_LIB_DIR ${_boost_LIB_DIR}/lib) + string(APPEND _boost_LIB_DIR /lib) + elseif(EXISTS "${_boost_LIB_DIR}/stage/lib") + string(APPEND _boost_LIB_DIR "/stage/lib") else() - if(EXISTS "${_boost_LIB_DIR}/stage/lib") - set(_boost_LIB_DIR ${_boost_LIB_DIR}/stage/lib) - else() - set(_boost_LIB_DIR "") - endif() + set(_boost_LIB_DIR "") endif() if(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}") |