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

Lowered the CMake required version for non-package builds.

Browse Source
This commit is contained in:
Markus Makela
2015-03-04 17:03:05 +02:00
parent 1b0fd4576a
commit 2b8cb8aa94
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -1,4 +1,9 @@
cmake_minimum_required(VERSION 2.8.12) if(PACKAGE)
cmake_minimum_required(VERSION 2.8.12)
else()
cmake_minimum_required(VERSION 2.8)
endif()
message(STATUS "CMake version: ${CMAKE_VERSION}") message(STATUS "CMake version: ${CMAKE_VERSION}")
include(macros.cmake) include(macros.cmake)

3
Documentation/Changelog.md
View File

@ -9,3 +9,6 @@ These are the changes introduced in MaxScale version 1.0.6
* RabbitMQ logging filter * RabbitMQ logging filter
* Added option to use high precision timestamps in logging * Added option to use high precision timestamps in logging
* Readwritesplit router now returns the master server's response * Readwritesplit router now returns the master server's response
* Minimum required CMake version is now 2.8.12 for package building.
* Session idle timeout added for services
* The logs can now be configured to have millisecond precision

9
server/modules/monitor/CMakeLists.txt
View File

@ -9,7 +9,8 @@ install(TARGETS galeramon DESTINATION modules)
add_library(ndbclustermon SHARED ndbcluster_mon.c) add_library(ndbclustermon SHARED ndbcluster_mon.c)
target_link_libraries(ndbclustermon log_manager utils) target_link_libraries(ndbclustermon log_manager utils)
install(TARGETS ndbclustermon DESTINATION modules) install(TARGETS ndbclustermon DESTINATION modules)
if(BUILD_MMMON)
add_library(mmmon SHARED mm_mon.c) add_library(mmmon SHARED mm_mon.c)
target_link_libraries(mmmon log_manager utils) target_link_libraries(mmmon log_manager utils)
install(TARGETS mmmon DESTINATION modules) install(TARGETS mmmon DESTINATION modules)
endif()