From: Uwe Hermann <redacted>
Date: Sat, 8 Aug 2015 17:19:47 +0000 (+0200)
Subject: Bump Boost requirement to >= 1.48.
X-Git-Tag: pulseview-0.3.0~153
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=c3bf1d31fb43dc26a00fef05d951806e3158c55b;p=pulseview.git

Bump Boost requirement to >= 1.48.

Older versions of Boost have issues with C++11 due to boost::shared_ptr.

Details:
http://stackoverflow.com/questions/18900730/boostshared-ptrshared-ptrconst-boostshared-ptr-is-implicitly-declared
https://svn.boost.org/trac/boost/changeset/73202

This seems to have been fixed in Boost 1.48 (untested, though).

This closes bug #593.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 800ffe27..326499f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,9 +99,9 @@ else()
 endif()
 
 if(ENABLE_TESTS)
-	find_package(Boost 1.42 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
+	find_package(Boost 1.48 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
 else()
-	find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
+	find_package(Boost 1.48 COMPONENTS filesystem system thread REQUIRED)
 endif()
 
 # Find the platform's thread library (needed for C++11 threads).
diff --git a/INSTALL b/INSTALL
index 746064be..42cc79b5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,7 +17,7 @@ Requirements
  - Qt4 >= 4.5 or Qt5 (including the following components):
     - Qt4: QtCore, QtGui, QtSvg
     - Qt5: Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg
- - libboost >= 1.42 (including the following libs):
+ - libboost >= 1.48 (including the following libs):
     - libboost-system
     - libboost-filesystem
     - libboost-thread