diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-12-13 16:23:20 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-12-13 16:23:20 -0800 |
| commit | c9dc222c77dd0e1ce4a9cb8280b41e356ba4b84f (patch) | |
| tree | d1bc1d5fdc42f9a4bfe1d96b20b487ce1c477c65 /cmake | |
| parent | eeb34f8275bdb2bbd9f5bffc40afa2dd2cc7ddae (diff) | |
| parent | 302d51a1bdec2e8bc32e1b4a2188cfe212637076 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'cmake')
| -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() |