summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-11-19 12:52:55 -0500
committerSergei Golubchik <serg@mariadb.org>2015-11-20 09:16:36 +0100
commitdf25018c2ab16927ce778aebf506467f3797f729 (patch)
treea9da68c6e1ff639d4895f002849d2e5fd8672b36
parent87c306802b9f431dd5fd70f10bf946c52e843b42 (diff)
downloadmariadb-git-df25018c2ab16927ce778aebf506467f3797f729.tar.gz
MDEV-6264: CentOS missing lsof as dependency for MariaDB-server (10.1)
wsrep.cmake should be included before cpack_rpm.cmake as it defines WITH_WSREP, required by cpack_rpm.cmake to conditionally include galera helper tools in server package's requires list.
-rw-r--r--CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 728cc629af7..c06b12a5b12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,11 +144,11 @@ ENDIF(NOT CPACK_GENERATOR)
INCLUDE(mysql_version)
INCLUDE(cpack_source_ignore_files)
INCLUDE(install_layout)
+INCLUDE(wsrep)
INCLUDE(cpack_rpm)
INCLUDE(cpack_deb)
# Add macros
-INCLUDE(wsrep)
INCLUDE(character_sets)
INCLUDE(cpu_info)
INCLUDE(zlib)