diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-05 19:08:55 +0200 |
| commit | f6633bf058802ad7da8196d01fd19d75c53f7274 (patch) | |
| tree | b7ba9832aae2a3d0c72d2bf3d89cf2a5f13a44f6 /cmake | |
| parent | fc5932a1b733b331be20c3f1b45c61c798227dba (diff) | |
| parent | e555540ab6b9c3e0d4fdd00af093b115a9401d0a (diff) | |
| download | mariadb-git-f6633bf058802ad7da8196d01fd19d75c53f7274.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 7 | ||||
| -rw-r--r-- | cmake/ssl.cmake | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 7a037d7ce43..47daa88d0a2 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -33,7 +33,12 @@ SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts ) SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME}) -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") + SET(CPACK_RPM_DEBUGINFO_PACKAGE ON) +ENDIF() SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") SET(CPACK_RPM_PACKAGE_LICENSE "GPLv2") diff --git a/cmake/ssl.cmake b/cmake/ssl.cmake index d407ea3d26f..be25c3bbd28 100644 --- a/cmake/ssl.cmake +++ b/cmake/ssl.cmake @@ -124,7 +124,7 @@ MACRO (MYSQL_CHECK_SSL) SET(OPENSSL_ROOT_DIR ${WITH_SSL_PATH}) ENDIF() ENDIF() - FIND_PACKAGE(OpenSSL) + FIND_PACKAGE(OpenSSL 1.0.0) IF(OPENSSL_FOUND) SET(OPENSSL_LIBRARY ${OPENSSL_SSL_LIBRARY}) INCLUDE(CheckSymbolExists) |