commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 01/03: CMake: GrBoost: Remove old workaroun


From: git
Subject: [Commit-gnuradio] [gnuradio] 01/03: CMake: GrBoost: Remove old workaround
Date: Fri, 11 Nov 2016 21:19:05 +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 660e500fd6cd4e5e4189ea9bd42c035bf8b8eb31
Author: Paul Cercueil <address@hidden>
Date:   Wed Nov 9 12:51:17 2016 +0100

    CMake: GrBoost: Remove old workaround
    
    With recent versions of mingw-w64, or maybe with recent versions of
    Boost, the 'thread' component of Boost correctly points to the Win32
    variant when building under MinGW.
    
    Signed-off-by: Paul Cercueil <address@hidden>
---
 cmake/Modules/GrBoost.cmake | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/cmake/Modules/GrBoost.cmake b/cmake/Modules/GrBoost.cmake
index 6e036a5..1cf8e65 100644
--- a/cmake/Modules/GrBoost.cmake
+++ b/cmake/Modules/GrBoost.cmake
@@ -32,14 +32,9 @@ set(BOOST_REQUIRED_COMPONENTS
     filesystem
     system
     regex
+    thread
 )
 
-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")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]