diff options
| author | Brad King <brad.king@kitware.com> | 2015-06-01 10:07:55 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-01 10:10:08 -0400 |
| commit | b3df1e9f709df1e06e8c25be295a40ecd551103e (patch) | |
| tree | 4ead19c4a78e9b1424c29a8adf28b4ac13f347c2 | |
| parent | 39e0aa5390964953e1462f0efed0058c172a0a26 (diff) | |
| download | cmake-b3df1e9f709df1e06e8c25be295a40ecd551103e.tar.gz | |
FindBoost: Fix Boost_LIBRARY_DIR_{RELEASE,DEBUG} cache entry configuration
These cache entries introduced by commit 892b854f (FindBoost: Search for
debug and release libraries separately, 2015-01-26) should be marked as
advanced just as Boost_LIBRARY_DIR was. Also their _LAST values should
be tracked so changes can be detected reliably. Both of these are
handled by code looking in _Boost_VARS_LIB for a list of relevant
variables. Fix construction of this list that was broken by the above
commit.
Reported-by: Sylvain Joubert <joubert.sy@gmail.com>
| -rw-r--r-- | Modules/FindBoost.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 466090b687..bf37e03814 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -879,8 +879,10 @@ endif() # Begin finding boost libraries # ------------------------------------------------------------------------ +set(_Boost_VARS_LIB "") foreach(c DEBUG RELEASE) set(_Boost_VARS_LIB_${c} BOOST_LIBRARYDIR Boost_LIBRARY_DIR_${c}) + list(APPEND _Boost_VARS_LIB ${_Boost_VARS_LIB_${c}}) _Boost_CHANGE_DETECT(_Boost_CHANGE_LIBDIR_${c} ${_Boost_VARS_DIR} ${_Boost_VARS_LIB_${c}} Boost_INCLUDE_DIR) # Clear Boost_LIBRARY_DIR_${c} if it did not change but other input affecting the # location did. We will find a new one based on the new inputs. |