From: Uwe Hermann <redacted>
Date: Tue, 28 Mar 2017 06:41:48 +0000 (+0200)
Subject: Drop unused boost-thread dependency.
X-Git-Tag: pulseview-0.4.0~115
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=b8f1cdeba7cf6c2b749ff60102ce4e260fa1309e

Drop unused boost-thread dependency.

We no longer use boost-thread currently (in favor of C++11 thread
facilities), so drop the obsolete dependency from code and docs.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4325bf7..d2697fae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,14 +42,6 @@ if(WIN32)
 	# This option is user configurable, but enable it by default on win32.
 	set(STATIC_PKGDEPS_LIBS TRUE)
 
-	# For boost-thread we need two additional settings on 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()
@@ -102,7 +94,7 @@ else()
 	find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-set(BOOSTCOMPS filesystem serialization system thread)
+set(BOOSTCOMPS filesystem serialization system)
 if(ENABLE_TESTS)
 	list(APPEND BOOSTCOMPS unit_test_framework)
 endif()
diff --git a/INSTALL b/INSTALL
index 44e8a0d0..e17cb252 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,7 +21,6 @@ Requirements
  - libboost >= 1.55 (including the following libs):
     - libboost-system
     - libboost-filesystem
-    - libboost-thread
     - libboost-serialization
     - libboost-test (optional, only needed to run the unit tests)
  - libsigrokcxx >= 0.4.0 (libsigrok C++ bindings)
diff --git a/pv/popups/channels.cpp b/pv/popups/channels.cpp
index 9775998f..49784bd7 100644
--- a/pv/popups/channels.cpp
+++ b/pv/popups/channels.cpp
@@ -19,12 +19,6 @@
 
 #include <map>
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
 #include <QCheckBox>
 #include <QFormLayout>
 #include <QGridLayout>
diff --git a/pv/session.cpp b/pv/session.cpp
index d7041d8b..31ca328d 100644
--- a/pv/session.cpp
+++ b/pv/session.cpp
@@ -17,12 +17,6 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
 #include <QFileInfo>
 
 #include <cassert>
diff --git a/pv/session.hpp b/pv/session.hpp
index c27afcb1..c7e1699b 100644
--- a/pv/session.hpp
+++ b/pv/session.hpp
@@ -29,12 +29,6 @@
 #include <unordered_set>
 #include <vector>
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
 #include <QObject>
 #include <QSettings>
 #include <QString>
diff --git a/pv/storesession.cpp b/pv/storesession.cpp
index db766179..cb643682 100644
--- a/pv/storesession.cpp
+++ b/pv/storesession.cpp
@@ -19,12 +19,6 @@
 
 #include <cassert>
 
-#ifdef _WIN32
-// Windows: Avoid boost/thread namespace pollution (which includes windows.h).
-#define NOGDI
-#define NORESOURCE
-#endif
-
 #include "storesession.hpp"
 
 #include <pv/data/analog.hpp>