On Mon, Oct 17, 2016 at 01:50 +0200, Uwe Hermann wrote:
>
> Thanks! Can you please update the check in CMakeLists.txt as well in
> this patch?
See the attached v2 patch. It was tested with and without tests
enabled. But not with unmet dependencies (older libs), since I
switched to 1.55 to fix the issue. :) Should work though as the
change is rather straight forward.
virtually yours
Gerhard Sittig
--
If you don't understand or are scared by any of the above
ask your parents or an adult to help you.
>From c0b311acf3d8069d42e9d8b48299924ad79513e6 Mon Sep 17 00:00:00 2001
From: Gerhard Sittig <gerhard.sit...@gmx.net>
Date: Thu, 13 Oct 2016 16:25:39 +0200
Subject: [PATCH v2] 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 <gerhard.sit...@gmx.net>
---
changes in v2: adjust cmake logic, too
---
CMakeLists.txt | 6 +++---
INSTALL | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69e62ee5e4dd..d84f0427d6ea 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 3fddb39a5c3f..44e8a0d0adc6 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
--
1.9.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
