diff --git a/CHANGES b/CHANGES index e7006e0ab0..cf1b682f81 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.3-375 | 2015-01-08 13:10:09 -0600 + + * Increase minimum required CMake version to 2.8. (Jon Siwek) + 2.3-374 | 2015-01-07 10:03:17 -0600 * Improve documentation of the Intelligence Framework. (Daniel Thayer) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a287ef5b4..c0ff6c09d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ project(Bro C CXX) # When changing the minimum version here, also adapt # aux/bro-aux/plugin-support/skeleton/CMakeLists.txt -cmake_minimum_required(VERSION 2.6.3 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8 FATAL_ERROR) include(cmake/CommonCMakeConfig.cmake) diff --git a/VERSION b/VERSION index feb900b5ab..41ff87b741 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-374 +2.3-375 diff --git a/aux/bro-aux b/aux/bro-aux index 43a9f360c9..0b713c027d 160000 --- a/aux/bro-aux +++ b/aux/bro-aux @@ -1 +1 @@ -Subproject commit 43a9f360c9bf6b35fcb25d61ebff80c7feb1812b +Subproject commit 0b713c027d3efaaca50e5df995c02656175573cd diff --git a/doc/install/install.rst b/doc/install/install.rst index 0052acafb0..a3531f70c3 100644 --- a/doc/install/install.rst +++ b/doc/install/install.rst @@ -35,7 +35,7 @@ before you begin: To build Bro from source, the following additional dependencies are required: - * CMake 2.6.3 or greater (http://www.cmake.org) + * CMake 2.8 or greater (http://www.cmake.org) * Make * C/C++ compiler * SWIG (http://www.swig.org)