From 4d21e901efd54de7a1007dc87bb464669dddee9d Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Thu, 18 Dec 2014 15:27:37 +0200
Subject: [PATCH] Package building now requires CMake version 2.8.12 or
 greater.

---
 CMakeLists.txt | 78 +++++++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7ef07397..f3adf787f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,43 +120,49 @@ install(FILES server/MaxScale_template.cnf DESTINATION etc)
 install(FILES ${ERRMSG} DESTINATION mysql)
 install(FILES ${DOCS} DESTINATION Documentation)
 install(DIRECTORY DESTINATION log)
-# See if we are on a RPM-capable or DEB-capable system
-find_program(RPMBUILD rpmbuild)
-find_program(DEBBUILD dpkg-buildpackage)
-set(CPACK_GENERATOR "TGZ")
-if(NOT ( ${RPMBUILD} STREQUAL "RPMBUILD-NOTFOUND" ) )
-  message(STATUS "Generating RPM packages")
-  set(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
+
+if(${CMAKE_VERSION} VERSION_LESS 2.8.12)
+  message(WARNING "CMake version is ${CMAKE_VERSION}. Building of packages requires version 2.8.12 or greater.")
+else()
+  # See if we are on a RPM-capable or DEB-capable system
+  find_program(RPMBUILD rpmbuild)
+  find_program(DEBBUILD dpkg-buildpackage)
+  set(CPACK_GENERATOR "TGZ")
+  if(NOT ( ${RPMBUILD} STREQUAL "RPMBUILD-NOTFOUND" ) )
+    message(STATUS "Generating RPM packages")
+    set(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
+  endif()
+
+  if(NOT ( ${DEBBUILD} STREQUAL "DEBBUILD-NOTFOUND" ) )
+    set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
+    execute_process(COMMAND dpgk --print-architecture OUTPUT_VARIABLE DEB_ARCHITECTURE)
+    set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE})
+    set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) 
+    message(STATUS "Generating DEB packages for ${DEB_ARCHITECTURE}")
+  endif()
+
+  set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MaxScale")
+  set(CPACK_PACKAGE_VERSION_MAJOR "${MAXSCALE_VERSION_MAJOR}")
+  set(CPACK_PACKAGE_VERSION_MINOR "${MAXSCALE_VERSION_MINOR}")
+  set(CPACK_PACKAGE_VERSION_PATCH "${MAXSCALE_VERSION_PATCH}")
+  set(CPACK_PACKAGE_CONTACT "MariaDB Corporation Ab")
+  set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}")
+  set(CPACK_PACKAGE_NAME "maxscale")
+  set(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab")
+  set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
+  set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+  set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig")
+  set(CPACK_RPM_PACKAGE_NAME "maxscale")
+  set(CPACK_RPM_PACKAGE_VENDOR "MariaDB Corporation Ab")
+  set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
+  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/etc /etc/ld.so.conf.d /etc/init.d /etc/rc.d/init.d")
+  set(CPACK_RPM_SPEC_MORE_DEFINE "%define ignore \#")
+  set(CPACK_RPM_USER_FILELIST "%ignore /etc/init.d")
+  set(CPACK_RPM_USER_FILELIST "%ignore /etc/ld.so.conf.d")
+  set(CPACK_RPM_USER_FILELIST "%ignore /etc")  
+  include(CPack)
 endif()
 
-if(NOT ( ${DEBBUILD} STREQUAL "DEBBUILD-NOTFOUND" ) )
-  set(CPACK_GENERATOR "${CPACK_GENERATOR};DEB")
-  execute_process(COMMAND dpgk --print-architecture OUTPUT_VARIABLE DEB_ARCHITECTURE)
-  set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE ${DEB_ARCHITECTURE})
-  set (CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) 
-  message(STATUS "Generating DEB packages for ${DEB_ARCHITECTURE}")
-endif()
-
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MaxScale")
-set(CPACK_PACKAGE_VERSION_MAJOR "${MAXSCALE_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${MAXSCALE_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${MAXSCALE_VERSION_PATCH}")
-set(CPACK_PACKAGE_CONTACT "MariaDB Corporation Ab")
-set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}")
-set(CPACK_PACKAGE_NAME "maxscale")
-set(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab")
-set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README)
-set(CPACK_PACKAGING_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig")
-set(CPACK_RPM_PACKAGE_NAME "maxscale")
-set(CPACK_RPM_PACKAGE_VENDOR "MariaDB Corporation Ab")
-set(CPACK_RPM_PACKAGE_LICENSE "GPLv2")
-set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/etc /etc/ld.so.conf.d /etc/init.d /etc/rc.d/init.d")
-set(CPACK_RPM_SPEC_MORE_DEFINE "%define ignore \#")
-set(CPACK_RPM_USER_FILELIST "%ignore /etc/init.d")
-set(CPACK_RPM_USER_FILELIST "%ignore /etc/ld.so.conf.d")
-set(CPACK_RPM_USER_FILELIST "%ignore /etc")
-include(CPack)
 
 add_custom_target(buildtests
   COMMAND ${CMAKE_COMMAND} -DDEPS_OK=Y -DBUILD_TESTS=Y -DBUILD_TYPE=Debug -DINSTALL_DIR=${CMAKE_BINARY_DIR} -DINSTALL_SYSTEM_FILES=N ${CMAKE_SOURCE_DIR}
@@ -207,4 +213,4 @@ add_custom_target(testall-valgrind
   COMMAND killall maxscale
   COMMENT "Running full test suite with Valgrind..." VERBATIM)
 
-endif()
\ No newline at end of file
+endif()