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 f4325bf7dcfdb16928a53a1fc62559e3e3342fda..d2697fae7c2c6d21a670166a39666283f49a933b 100644 (file)
--- 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 44e8a0d0adc6dc8069ee8c29cbc9497600d0300f..e17cb252e08061c4383290626d7309afb7e687ea 100644 (file)
--- 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 9775998f0422127b56db25d4172b6bb10545c389..49784bd7ae40630f3f5b3ccc4e125a9f228053e4 100644 (file)
--- 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 d7041d8ba2bea774e01cde16aabbd6e8b987f53b..31ca328deca53bf1c9cfd90d426fb228da228af6 100644 (file)
--- 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 c27afcb15f1177ed2b7951fec816279fc69ad92a..c7e1699bbac1193342e35e81df919be33b7fcfe6 100644 (file)
--- 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 db766179e61f0c5b2d267221c809db8c2bb724c5..cb643682d57023462e38cc8dbd228bcd2182a353 100644 (file)
--- 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>