Move the InstallConfig include into the top-level CMakeLists.txt file

refs #7794

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d117c36c3b49d1299495c7077755ab5f21ee063..1e8745758c2123a9d5e3edf9cac9835b4e99efd5 100644 (file)
--- 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 1544828ff10160c21d5d7c390967fb25e8d0479a..b6fdcb97f29d884b5ed5f78344d90b13862203a6 100644 (file)
--- 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)