From: Uwe Hermann <redacted>
Date: Thu, 4 Dec 2014 13:54:24 +0000 (+0100)
Subject: CMakeLists.txt: mingw: Simplify by using Boost_THREADAPI.
X-Git-Tag: pulseview-0.3.0~405
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=e6fd809f20855828c4f393a0e0659d65818d79c7;ds=sidebyside

CMakeLists.txt: mingw: Simplify by using Boost_THREADAPI.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93021a64..a66a95bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,10 @@ if(WIN32)
 	set(Boost_USE_STATIC_LIBS ON)
 	add_definitions(-DBOOST_THREAD_USE_LIB)
 
+	# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
+	# The library is named libboost_thread_win32* (not libboost_thread*).
+	set(Boost_THREADAPI win32)
+
 	# Windows does not support UNIX signals.
 	set(ENABLE_SIGNALS FALSE)
 endif()
@@ -94,21 +98,11 @@ else()
 	find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-if(WIN32)
-if(ENABLE_TESTS)
-	# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
-	# The library is named libboost_thread_win32* (not libboost_thread*).
-	find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 unit_test_framework REQUIRED)
-else()
-	find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 REQUIRED)
-endif()
-else()
 if(ENABLE_TESTS)
 	find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
 else()
 	find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
 endif()
-endif()
 
 # Find the platform's thread library (needed for C++11 threads).
 # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.