From 7be19a213437de030b7c912af698f05bf087aed1 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Fri, 19 Dec 2014 09:51:14 +0100 Subject: [PATCH] Move the InstallConfig include into the top-level CMakeLists.txt file refs #7794 --- CMakeLists.txt | 1 + etc/CMakeLists.txt | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d117c36c..1e8745758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ file(STRINGS icinga2.spec VERSION_LINE REGEX "^Version: ") string(REPLACE "Version: " "" ICINGA2_VERSION ${VERSION_LINE}) include(GNUInstallDirs) +include(InstallConfig) set(ICINGA2_USER "icinga" CACHE STRING "Icinga 2 user") set(ICINGA2_GROUP "icinga" CACHE STRING "Icinga 2 group") diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt index 1544828ff..b6fdcb97f 100644 --- a/etc/CMakeLists.txt +++ b/etc/CMakeLists.txt @@ -15,8 +15,6 @@ # along with this program; if not, write to the Free Software Foundation # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -include(InstallConfig) - configure_file(icinga/icinga-classic-apache.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga/icinga-classic-apache.conf @ONLY) configure_file(icinga2/init.conf.cmake ${CMAKE_CURRENT_BINARY_DIR}/icinga2/init.conf @ONLY) -- 2.40.0