summaryrefslogtreecommitdiffstats
path: root/host
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-03-18 13:20:58 -0800
committerJosh Blum <josh@joshknows.com>2010-03-18 13:20:58 -0800
commite24a1e88f62794d8d89736e54cb64242e008c209 (patch)
treeeda56296764b0103ae6a376b6445a2736274b512 /host
parentf2a86eb6389210a8ebd475782ab707f814c6e49c (diff)
downloaduhd-e24a1e88f62794d8d89736e54cb64242e008c209.tar.gz
uhd-e24a1e88f62794d8d89736e54cb64242e008c209.tar.bz2
uhd-e24a1e88f62794d8d89736e54cb64242e008c209.zip
fixed linking and warnings on msvs
Diffstat (limited to 'host')
-rw-r--r--host/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 3576a690f..d144d9aeb 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -64,11 +64,14 @@ IF(WIN32)
ADD_DEFINITIONS(-Dnot=! -Dand=&& -Dor=||) #logical operators
ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) #as requested by vs
ADD_DEFINITIONS(-DNOMINMAX) #disables stupidity and enables std::min and std::max
+ ADD_DEFINITIONS(-DBOOST_THREAD_DYN_DLL) #avoids multiple symbols link error
+ ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) #avoid warnings from boost::split
ENDIF(WIN32)
########################################################################
# Setup Boost
########################################################################
+SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42")
FIND_PACKAGE(Boost 1.36 REQUIRED
date_time
program_options