]> git.ipfire.org Git - thirdparty/vectorscan.git/commitdiff
Merge master into develop
authorMatthew Barr <matthew.barr@intel.com>
Fri, 2 Dec 2016 00:21:29 +0000 (11:21 +1100)
committerMatthew Barr <matthew.barr@intel.com>
Fri, 2 Dec 2016 00:21:29 +0000 (11:21 +1100)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
index c9a6f8dbb8bad71795317d81c2f3aa56a997631d,842834a15daaa14a574403b4ba9317e9799290ff..6f506e9b22899e2f00fe744311175bc8d998caa7
@@@ -3,9 -7,13 +3,9 @@@ project (Hyperscan C CXX
  
  set (HS_MAJOR_VERSION 4)
  set (HS_MINOR_VERSION 3)
- set (HS_PATCH_VERSION 1)
+ set (HS_PATCH_VERSION 2)
  set (HS_VERSION ${HS_MAJOR_VERSION}.${HS_MINOR_VERSION}.${HS_PATCH_VERSION})
  
 -# since we are doing this manually, we only have three types
 -set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo"
 -     CACHE STRING "" FORCE)
 -
  set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
  include(CheckCCompilerFlag)
  include(CheckCXXCompilerFlag)