summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>2011-01-15 16:22:56 +0200
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>2011-01-15 16:22:56 +0200
commitca45f163ffb83a22c02323e8623d96da2d684ec4 (patch)
tree9f835105f8310d3858b824025255c3c5027d63ad
parent57c4112c7972c4daf29fff88137dfe1dc37c2c02 (diff)
Add version check for boost: require version 1.39 or later.
Version 1.39 is the version that introduces the required BOOST_NO_<CXX0X_FEATURE> macros that are used in QGlib/global.h. Earlier versions do not define these, so global.h will assume that we have full C++0x support, although we don't.
-rw-r--r--CMakeLists.txt4
-rw-r--r--README2
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbecf0a..ede3fad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,8 @@ include(MacroLogFeature)
find_package(Qt4 COMPONENTS QtCore QtGui QtTest)
macro_log_feature(QT4_FOUND "Qt 4" "Required for building everything" "http://qt.nokia.com/" TRUE "4.5")
-find_package(Boost)
-macro_log_feature(Boost_FOUND "Boost" "Required for building QtGLib" "http://www.boost.org/" TRUE "1.40")
+find_package(Boost 1.39)
+macro_log_feature(Boost_FOUND "Boost" "Required for building QtGLib" "http://www.boost.org/" TRUE "1.39")
# this just sets the QTGSTREAMER_* cmake variables
set(BUILDING_QTGSTREAMER TRUE)
diff --git a/README b/README
index 214edb4..e816024 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@ QtGStreamer requires the following software to be installed in order to build:
and including gstreamer-plugins-base (0.10.31 or later)
* Qt 4.5 or later <http://qt.nokia.com/>
* Automoc <https://projects.kde.org/projects/kdesupport/automoc/>
- * Boost <http://www.boost.org/>
+ * Boost 1.39 or later <http://www.boost.org/>
* Flex <http://flex.sourceforge.net/>
* Bison <http://www.gnu.org/software/bison/>