diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-21 15:36:44 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-21 15:36:44 -0800 |
| commit | 93af8e3734a44d3b43e5c25570c457b151977ae5 (patch) | |
| tree | 9cdc2373e44b780c86ed9a646433e1defb228cda /cmake | |
| parent | e7fca2fa9ddaa5468374c1f664a0ddc7043709db (diff) | |
| parent | e7e219cde48347fbaf8849fcb820212893272a2e (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/general/gr_random_pdu.cc
volk/apps/volk_profile.cc
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index 38cb027f8c..01378df662 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -39,6 +39,8 @@ if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") if(MSVC) + set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} chrono) + if (NOT DEFINED BOOST_ALL_DYN_LINK) set(BOOST_ALL_DYN_LINK TRUE) endif() |