diff options
| author | Josh Blum <josh@joshknows.com> | 2010-03-18 16:40:44 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-03-18 16:40:44 -0800 |
| commit | 35bcf1c6e696c9f05297c39ba05b4117dfeb8e17 (patch) | |
| tree | 0b95b3b231d5e502a157acaba8b1e1067f0b3b15 /host/CMakeLists.txt | |
| parent | e24a1e88f62794d8d89736e54cb64242e008c209 (diff) | |
| download | uhd-35bcf1c6e696c9f05297c39ba05b4117dfeb8e17.tar.gz uhd-35bcf1c6e696c9f05297c39ba05b4117dfeb8e17.tar.bz2 uhd-35bcf1c6e696c9f05297c39ba05b4117dfeb8e17.zip | |
created config.hpp to handle export macros, added exports to public api stuff
Diffstat (limited to 'host/CMakeLists.txt')
| -rw-r--r-- | host/CMakeLists.txt | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index d144d9aeb..d8947a441 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -64,7 +64,6 @@ 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) @@ -74,6 +73,7 @@ ENDIF(WIN32) SET(Boost_ADDITIONAL_VERSIONS "1.42.0" "1.42") FIND_PACKAGE(Boost 1.36 REQUIRED date_time + filesystem program_options regex system @@ -84,6 +84,17 @@ FIND_PACKAGE(Boost 1.36 REQUIRED INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +IF(WIN32) + #force dynamic linking (otherwise automatic linking fails in msvs) + ADD_DEFINITIONS(-DBOOST_DATE_TIME_DYN_DLL) + ADD_DEFINITIONS(-DBOOST_FILESYSTEM_DYN_DLL) + ADD_DEFINITIONS(-DBOOST_PROGRAM_OPTIONS_DYN_DLL) + ADD_DEFINITIONS(-DBOOST_REGEX_DYN_DLL) + ADD_DEFINITIONS(-DBOOST_SYSTEM_DYN_DLL) + ADD_DEFINITIONS(-DBOOST_THREAD_DYN_DLL) + ADD_DEFINITIONS(-DBOOST_UNIT_TEST_FRAMEWORK_DYN_DLL) +ENDIF(WIN32) + ######################################################################## # Setup Endianess ######################################################################## |