diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-12-13 16:21:02 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-12-13 16:21:02 -0800 |
| commit | 7bf326a6d3b15c78fa31406ae28c7e707d28badf (patch) | |
| tree | 1370ec61820a32179873293f183154a361fb4432 /cmake/Modules | |
| parent | 0ec18440b11abe865f463474d99cf59be18b207f (diff) | |
| parent | 043e9310bf35d9b31e304bc095b1f3d4004923b0 (diff) | |
Merge branch 'maint'
Diffstat (limited to 'cmake/Modules')
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index 1cf8e65a11..39a78c5b86 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() |