[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/03: cmake: atomic and chrono for BOOST_R
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/03: cmake: atomic and chrono for BOOST_REQUIRED_COMPONENTS |
Date: |
Wed, 14 Dec 2016 00:35:45 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch maint
in repository gnuradio.
commit 67f7306c9f7cee308e3df0b6197479f199e74aa9
Author: Josh Blum <address@hidden>
Date: Mon Dec 12 00:28:00 2016 -0800
cmake: atomic and chrono for BOOST_REQUIRED_COMPONENTS
Conditional inclusion of atomic and chrono
so that they will be linked under windows,
but not bump the minimum boost for other platforms.
---
cmake/Modules/GrBoost.cmake | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake
index 1cf8e65..39a78c5 100644
--- a/cmake/Modules/GrBoost.cmake
+++ b/cmake/Modules/GrBoost.cmake
@@ -39,9 +39,24 @@ if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
-if(MSVC)
- set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} chrono)
+if(WIN32)
+ #The following libraries are either used indirectly,
+ #or conditionally within the various core components.
+ #We explicitly list the libraries here because they
+ #are either required in environments MSVC and MINGW
+ #or linked-in automatically via header inclusion.
+
+ #However, this is not robust; and its recommended that
+ #these libraries should be listed in the main components
+ #list once the minimum version of boost had been bumped
+ #to a version which always contains these components.
+ list(APPEND BOOST_REQUIRED_COMPONENTS
+ atomic
+ chrono
+ )
+endif(WIN32)
+if(MSVC)
if (NOT DEFINED BOOST_ALL_DYN_LINK)
set(BOOST_ALL_DYN_LINK TRUE)
endif()