]> sigrok.org Git - pulseview.git/commitdiff
Bump Boost requirement to >= 1.48.
authorUwe Hermann <redacted>
Sat, 8 Aug 2015 17:19:47 +0000 (19:19 +0200)
committerUwe Hermann <redacted>
Sat, 8 Aug 2015 17:19:47 +0000 (19:19 +0200)
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.

CMakeLists.txt
INSTALL

index 800ffe27fec0aea78c3d4cd20b9f9bae4d1be06c..326499f144ef2f1bd237e5fdf8704b0189007fcf 100644 (file)
@@ -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 746064be82546e428b116e37e1ef9ae269b19582..42cc79b5f6312d3e4a67068e3fe80cc9e4e32c0a 100644 (file)
--- 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