From 6495e8576043c9d6fdbf69fdf76a554aa5986300 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sun, 1 Mar 2015 01:27:42 +0100 Subject: [PATCH] Enable unity builds by default --- CMakeLists.txt | 2 +- INSTALL.md | 2 +- icinga2.spec | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 52886623a..78a081cec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,7 @@ set(ICINGA2_COMMAND_GROUP "icingacmd" CACHE STRING "Icinga 2 command group") set(ICINGA2_RUNDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run" CACHE STRING "/run directory") set(ICINGA2_PLUGINDIR "/usr/lib/nagios/plugins" CACHE STRING "Path for the check plugins") set(ICINGA2_GIT_VERSION_INFO ON CACHE BOOL "Whether to use git describe") -set(ICINGA2_UNITY_BUILD OFF CACHE BOOL "Whether to perform a unity build") +set(ICINGA2_UNITY_BUILD ON CACHE BOOL "Whether to perform a unity build") file(READ "${CMAKE_CURRENT_SOURCE_DIR}/COPYING" ICINGA2_LICENSE_GPL) file(READ "${CMAKE_CURRENT_SOURCE_DIR}/COPYING.Exceptions" ICINGA2_LICENSE_ADDITIONS) diff --git a/INSTALL.md b/INSTALL.md index 950c0c1b1..4e39ee492 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -142,7 +142,7 @@ variables are supported: - `ICINGA2_GROUP`: The group Icinga 2 should run as; defaults to `icinga` - `ICINGA2_GIT_VERSION_INFO`: Whether to use Git to determine the version number; defaults to `ON` - `ICINGA2_COMMAND_GROUP`: The command group Icinga 2 should use; defaults to `icingacmd` -- `ICINGA2_UNITY_BUILD`: Whether to perform a unity build; defaults to `OFF` +- `ICINGA2_UNITY_BUILD`: Whether to perform a unity build; defaults to `ON` - `ICINGA2_PLUGINDIR`: The path for the Monitoring Plugins project binaries; defaults to `/usr/lib/nagios/plugins` - `ICINGA2_RUNDIR`: The location of the "run" directory; defaults to `CMAKE_INSTALL_LOCALSTATEDIR/run` - `CMAKE_INSTALL_SYSCONFDIR`: The configuration directory; defaults to `CMAKE_INSTALL_PREFIX/etc` diff --git a/icinga2.spec b/icinga2.spec index 9620f50f7..165cb7522 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -201,8 +201,7 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ -DICINGA2_RUNDIR=%{_rundir} \ -DICINGA2_USER=%{icinga_user} \ -DICINGA2_GROUP=%{icinga_group} \ - -DICINGA2_COMMAND_GROUP=%{icingacmd_group} \ - -DICINGA2_UNITY_BUILD=TRUE" + -DICINGA2_COMMAND_GROUP=%{icingacmd_group}" %if "%{_vendor}" == "redhat" %if 0%{?el5} || 0%{?rhel} == 5 || "%{?dist}" == ".el5" # Boost_VERSION 1.41.0 vs 101400 - disable build tests