From bc49b6a901580769859173e56c17c557c02ae8b8 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Sat, 13 Sep 2014 04:13:25 +0300 Subject: [PATCH] CPack configurations updated to better match expected values --- CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83e246e87..c259a5c5b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,16 +11,16 @@ configure_file(${CMAKE_SOURCE_DIR}/server/include/version.h.in ${CMAKE_SOURCE_DI if(NOT MYSQL_DIR) find_path(MYSQL_DIR mysql.h PATH_SUFFIXES mysql mariadb) - if(MYSQL_DIR_NOT_FOUND) + if(MYSQL_DIR-NOTFOUND) message(FATAL_ERROR "Fatal Error: MySQL headers were not found.") - endif(MYSQL_DIR_NOT_FOUND) + endif(MYSQL_DIR-NOTFOUND) endif() if(NOT ERRMSG) find_file(ERRMSG errmsg.sys PATHS /usr/share/mysql /usr/local/share/mysql ${CUSTOM_ERRMSG} PATH_SUFFIXES english) - if(ERRMSG_NOT_FOUND) + if(ERRMSG-NOTFOUND) message(FATAL_ERROR "Fatal Error: The errmsg.sys file was not found.") - endif(ERRMSG_NOT_FOUND) + endif(ERRMSG-NOTFOUND) endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") @@ -36,7 +36,7 @@ if((NOT EMBEDDED_LIB) AND STATIC_EMBEDDED) find_file(EMBEDDED_LIB libmysqld.a PATHS /usr/lib /usr/lib64 PATH_SUFFIXES mysql mariadb) - if(EMBEDDED_LIB_NOT_FOUND) + if(EMBEDDED_LIB-NOTFOUND) message(WARNING "Warning: Static library not found, looking for dynamic version") find_library(EMBEDDED_LIB mysqld PATHS /usr/lib /usr/lib64 PATH_SUFFIXES mysql mariadb) get_filename_component(EMBEDDED_LIB ${EMBEDDED_LIB} REALPATH) @@ -49,7 +49,7 @@ elseif( NOT STATIC_EMBEDDED) endif() -if(EMBEDDED_LIB_NOT_FOUND) +if(EMBEDDED_LIB-NOTFOUND) message(FATAL_ERROR "Library not found: libmysqld. If your install of MySQL is in a non-default location, please provide the location with -DEMBEDDED_LIB=") else() message(STATUS "Using embedded library: ${EMBEDDED_LIB}") @@ -99,8 +99,12 @@ set(CPACK_PACKAGE_VERSION_MINOR "${MAXSCALE_VERSION_MINOR}") set(CPACK_PACKAGE_VERSION_PATCH "${MAXSCALE_VERSION_PATCH}") set(CPACK_PACKAGE_CONTACT "SkySQL Ab") set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}") +set(CPACK_PACKAGE_NAME "maxscale") +set(CPACK_PACKAGE_VENDOR "SkySQL Ab") +set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_SOURCE_DIR}/README) +set(CPACK_PACKAGING_INSTALL_PREFIX "/") set(CPACK_RPM_SPEC_INSTALL_POST "/sbin/ldconfig") -set(CPACK_RPM_PACKAGE_NAME "maxscale-${MAXSCALE_VERSION}") +set(CPACK_RPM_PACKAGE_NAME "maxscale") set(CPACK_RPM_PACKAGE_VENDOR "SkySQL Ab") set(CPACK_RPM_PACKAGE_AUTOREQPROV " no") include(CPack)