From e548e2184bed04478ba1fe5107da817bc768d023 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sun, 26 Mar 2017 16:00:35 +1100 Subject: Use CPACK_RPM_FILE_NAME="RPM-DEFAULT" This has been implemented in for cmake-3.6 to match distro version of what the filename should look like. Thanks to Domen Vranka for the suggestion. --- cmake/cpack_rpm.cmake | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'cmake') diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 5789eb7694a..c3ec731144b 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -28,7 +28,11 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts Common Client SharedLibraries) SET(CPACK_RPM_PACKAGE_NAME "MariaDB") -SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") +IF(CMAKE_VERSION VERSION_LESS "3.6.0") + SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") +ELSE() + SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT") +ENDIF() SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2") -- cgit v1.2.1 From 48429359d6bb6382245f1949c458f8219996aa4a Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 16 Jun 2017 11:34:59 +0200 Subject: MDEV-4646 No mysqld-debug or debuginfo in MariaDB-Server RPM --- cmake/cpack_rpm.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'cmake') diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index c3ec731144b..4e9410306a8 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -32,6 +32,7 @@ IF(CMAKE_VERSION VERSION_LESS "3.6.0") SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}") ELSE() SET(CPACK_RPM_FILE_NAME "RPM-DEFAULT") + SET(CPACK_RPM_DEBUGINFO_PACKAGE ON) ENDIF() SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") -- cgit v1.2.1 From d937916c064d46076f5cec2280d91870ed7576d4 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Wed, 14 Jun 2017 20:21:24 +0200 Subject: MDEV-12193 Discontinue support of unsecure and unsupported OpenSSL versions (< 1.0.1) --- cmake/ssl.cmake | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'cmake') diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index b699a3b493f..74d61b582ea 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -167,31 +167,32 @@ MACRO (MYSQL_CHECK_SSL) SET(CMAKE_REQUIRED_INCLUDES) IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES AND CRYPTO_LIBRARY AND HAVE_SHA512_DIGEST_LENGTH) - SET(SSL_SOURCES "") - SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY}) - IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") - SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET}) - ENDIF() - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL}) - ENDIF() - # Verify version number. Version information looks like: # #define OPENSSL_VERSION_NUMBER 0x1000103fL # Encoded as MNNFFPPS: major minor fix patch status FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" OPENSSL_VERSION_NUMBER - REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" + REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ) STRING(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" ) + MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}") + ENDIF() + IF(OPENSSL_MAJOR_VERSION GREATER 0) + SET(SSL_SOURCES "") + SET(SSL_LIBRARIES ${OPENSSL_LIBRARIES} ${CRYPTO_LIBRARY}) + IF(CMAKE_SYSTEM_NAME MATCHES "SunOS") + SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBSOCKET}) + ENDIF() + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(SSL_LIBRARIES ${SSL_LIBRARIES} ${LIBDL}) + ENDIF() MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${OPENSSL_INCLUDE_DIR}") MESSAGE(STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}") MESSAGE(STATUS "CRYPTO_LIBRARY = ${CRYPTO_LIBRARY}") - MESSAGE(STATUS "OPENSSL_MAJOR_VERSION = ${OPENSSL_MAJOR_VERSION}") MESSAGE(STATUS "SSL_LIBRARIES = ${SSL_LIBRARIES}") SET(SSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR}) SET(SSL_INTERNAL_INCLUDE_DIRS "") -- cgit v1.2.1