From: Gerhard Sittig <redacted>
Date: Thu, 13 Oct 2016 14:25:39 +0000 (+0200)
Subject: cmake, INSTALL: Bump the Boost requirement to >= 1.55.
X-Git-Tag: pulseview-0.4.0~243
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=d68d75c2a5bf479e5bb1c6dab3f052de3fb2e873;p=pulseview.git

cmake, INSTALL: Bump the Boost requirement to >= 1.55.

Support for serialization of multiprecision data (which is used for view
timestamps) was introduced in boost version 1.55. Since commit 3a21afa6
builds with versions up to and including 1.54 are reported to fail.

Bump the required version from 1.53 to 1.55. Rephrase the CMake logic
which searches for the Boost dependency. Create a list of libraries from
fixed and optional parts, which as a byproduct avoids long lines. Pass
that list of required libraries to one common find_package() call.

Signed-off-by: Gerhard Sittig <redacted>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e62ee5..d84f0427 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,11 +97,11 @@ else()
 	find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
+set(BOOSTCOMPS filesystem serialization system thread)
 if(ENABLE_TESTS)
-	find_package(Boost 1.53 COMPONENTS filesystem serialization system thread unit_test_framework REQUIRED)
-else()
-	find_package(Boost 1.53 COMPONENTS filesystem serialization system thread REQUIRED)
+	list(APPEND BOOSTCOMPS unit_test_framework)
 endif()
+find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED)
 
 # Find the platform's thread library (needed for C++11 threads).
 # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
diff --git a/INSTALL b/INSTALL
index 3fddb39a..44e8a0d0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,7 @@ Requirements
  - Qt4 >= 4.5 or Qt5 (including the following components):
     - Qt4: QtCore, QtGui, QtSvg
     - Qt5: Qt5Core, Qt5Gui, Qt5Widgets, Qt5Svg
- - libboost >= 1.53 (including the following libs):
+ - libboost >= 1.55 (including the following libs):
     - libboost-system
     - libboost-filesystem
     - libboost-thread