hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release-1.3.0' into develop

Browse Source 
To get all fixes made to release-1.3.0 also into develop.
This commit is contained in:
Johan Wikman
2015-12-14 14:09:51 +02:00
parent 0d760f7a30 24abdb36b4
commit acf80832ce
46 changed files with 1442 additions and 1443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/BuildPCRE2.cmake
View File

@ -9,7 +9,9 @@ include(ExternalProject)
set(PCRE2_ROOT_DIR ${CMAKE_SOURCE_DIR}/pcre2/)
set(PCRE2_BUILD_DIR ${CMAKE_BINARY_DIR}/pcre2/)
set(PCRE2_LIBRARIES ${CMAKE_BINARY_DIR}/pcre2/libpcre2-8.so CACHE STRING "PCRE2 dynamic libraries" FORCE)
set(PCRE2_LIBRARIES ${CMAKE_BINARY_DIR}/pcre2/libpcre2-8.so
${CMAKE_BINARY_DIR}/pcre2/libpcre2-8.so.1.0.0
CACHE STRING "PCRE2 dynamic libraries" FORCE)
ExternalProject_Add(pcre2 SOURCE_DIR ${PCRE2_ROOT_DIR}
CMAKE_ARGS -DBUILD_SHARED_LIBS=Y -DPCRE2_BUILD_PCRE2GREP=N -DPCRE2_BUILD_TESTS=N

2
cmake/macros.cmake
View File

@ -12,7 +12,7 @@ macro(set_maxscale_version)
set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version")
set(MAXSCALE_VERSION_PATCH "0" CACHE STRING "Patch version")
set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
set(MAXSCALE_VERSION "beta-${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
# This should be incremented each time a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")