diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 14:08:07 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-30 14:08:07 -0700 |
| commit | c034036fbb0a097b2ccbbacdfdb113f8355cdbcc (patch) | |
| tree | 12366caf390de89db7e7e32646b08854c8f01bc5 /cmake/Modules/GrBoost.cmake | |
| parent | 11ce2621937e6fa1d5440c8f485c7a27b9d34d27 (diff) | |
| parent | c5f7b07aff9320e3d13bb8d26aa4dc43093e569a (diff) | |
Merge branch 'next' into 'next-qt5'
Diffstat (limited to 'cmake/Modules/GrBoost.cmake')
| -rw-r--r-- | cmake/Modules/GrBoost.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake index ecf58a9367..6e036a5bdc 100644 --- a/cmake/Modules/GrBoost.cmake +++ b/cmake/Modules/GrBoost.cmake @@ -31,10 +31,15 @@ set(BOOST_REQUIRED_COMPONENTS program_options filesystem system - thread regex ) +if (MINGW) + set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} thread_win32) +else(MINGW) + set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} thread) +endif(MINGW) + 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") |