Enable unity builds by default

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52886623a1dcdb01479b827eaaf8ceb49b5e26d9..78a081cec909e442f88feb371a815e1d56679ee5 100644 (file)
--- 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 950c0c1b171b9c3fc34411c1de98573734448ee4..4e39ee49221f053bb05fb1dc493335266bd3e607 100644 (file)
--- 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 9620f50f7e9616a96192c8afb0aa4b9d71c553f4..165cb7522a40fca4b5dc49fd236b55a04da08c85 100644 (file)
--- 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