From 2b8cb8aa94cab553131fb39a99e5840cdda799b1 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Wed, 4 Mar 2015 17:03:05 +0200 Subject: [PATCH] Lowered the CMake required version for non-package builds. --- CMakeLists.txt | 7 ++++++- Documentation/Changelog.md | 3 +++ server/modules/monitor/CMakeLists.txt | 9 +++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a667edc29..6c8ade55f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") include(macros.cmake) diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md index 1499526d3..ffba35c00 100644 --- a/Documentation/Changelog.md +++ b/Documentation/Changelog.md @@ -9,3 +9,6 @@ These are the changes introduced in MaxScale version 1.0.6 * RabbitMQ logging filter * Added option to use high precision timestamps in logging * 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 diff --git a/server/modules/monitor/CMakeLists.txt b/server/modules/monitor/CMakeLists.txt index 67a771153..a99a66142 100644 --- a/server/modules/monitor/CMakeLists.txt +++ b/server/modules/monitor/CMakeLists.txt @@ -9,7 +9,8 @@ install(TARGETS galeramon DESTINATION modules) add_library(ndbclustermon SHARED ndbcluster_mon.c) target_link_libraries(ndbclustermon log_manager utils) install(TARGETS ndbclustermon DESTINATION modules) - -add_library(mmmon SHARED mm_mon.c) -target_link_libraries(mmmon log_manager utils) -install(TARGETS mmmon DESTINATION modules) +if(BUILD_MMMON) + add_library(mmmon SHARED mm_mon.c) + target_link_libraries(mmmon log_manager utils) + install(TARGETS mmmon DESTINATION modules) +endif()