Skip to content

Commit 23f3949

Browse files
committed
Merge branch 'development' into feature/build-tweaks
* development: cmake: set minimum Boost version 1.53.0 Signed-off-by: Torbjörn Klatt <[email protected]> Conflicts: 3rdparty/CMakeLists.txt
2 parents 9aba570 + 70b8832 commit 23f3949

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

3rdparty/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if(${compiler_version_available} AND ${CMAKE_CXX_COMPILER_ID} MATCHES Clang)
1313
set(Boost_COMPILER "-clang${CMAKE_CXX_COMPILER_VERSION_MAJOR}${CMAKE_CXX_COMPILER_VERSION_MINOR}")
1414
endif()
1515

16-
find_package(Boost COMPONENTS program_options REQUIRED)
16+
find_package(Boost 1.53.0 COMPONENTS program_options REQUIRED)
1717
set_package_properties(Boost
1818
PROPERTIES
1919
DESCRIPTION "C++ libraries"

doc/source/installing.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
* A recent C++ compiler that supports (most of) the C++11 standard.
66
* The [CMake](http://cmake.org/) build tool.
7+
* The [Boost](https://boost.org/) libraries at least of version 1.53.0.
8+
Especially `boost::program_options` is required.
79

810

911
## Obtaining the Sources

0 commit comments

Comments
 (0)