diff options
| author | Josh Blum | 2013-02-22 20:51:32 -0800 |
|---|---|---|
| committer | Josh Blum | 2013-02-22 20:51:32 -0800 |
| commit | ed4a675c651ebb74904d2e1d4297cdfac0e4f214 (patch) | |
| tree | 083e7da3a654998d454275b5bdba111062e49521 /volk | |
| parent | 9ecb12014a646f67b428f9415a5f186c59537dba (diff) | |
| parent | 984091a32e11f9f11a142c055a62bf694d7a7ae8 (diff) | |
| download | gnuradio-ed4a675c651ebb74904d2e1d4297cdfac0e4f214.tar.gz gnuradio-ed4a675c651ebb74904d2e1d4297cdfac0e4f214.tar.bz2 gnuradio-ed4a675c651ebb74904d2e1d4297cdfac0e4f214.zip | |
Merge branch 'maint' into v3.6.4git_gras_support
Conflicts:
volk/apps/volk_profile.cc
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt index 018283338..506c828c1 100644 --- a/volk/CMakeLists.txt +++ b/volk/CMakeLists.txt @@ -62,6 +62,18 @@ if(NOT CHEETAH_FOUND) message(FATAL_ERROR "Cheetah templates required to build VOLK") endif() +if(MSVC) + if (NOT DEFINED BOOST_ALL_DYN_LINK) + set(BOOST_ALL_DYN_LINK TRUE) + endif() + set(BOOST_ALL_DYN_LINK "${BOOST_ALL_DYN_LINK}" CACHE BOOL "boost enable dynamic linking") + if(BOOST_ALL_DYN_LINK) + add_definitions(-DBOOST_ALL_DYN_LINK) #setup boost auto-linking in msvc + else(BOOST_ALL_DYN_LINK) + unset(BOOST_REQUIRED_COMPONENTS) #empty components list for static link + endif(BOOST_ALL_DYN_LINK) +endif(MSVC) + set(Boost_ADDITIONAL_VERSIONS "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39" "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" |