diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-29 08:41:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-29 12:00:12 +0300 |
| commit | 1a3c36595320bd4cf94ba5ab6c5127129269af67 (patch) | |
| tree | 72954842785e24025db2b2638940251993142989 /cmake | |
| parent | e41eb044f19e3ee9b881344565924dd6b9d20e1a (diff) | |
| parent | 5e9b34191e395ced03fbbbe6aedc07b0a7293984 (diff) | |
| download | mariadb-git-1a3c36595320bd4cf94ba5ab6c5127129269af67.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 1 | ||||
| -rw-r--r-- | cmake/cpack_rpm.cmake | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 995621e0abe..f77907481a4 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -121,6 +121,7 @@ ENDIF() IF(UNIX) SET(WITH_EXTRA_CHARSETS all CACHE STRING "") + SET(PLUGIN_AUTH_PAM YES) IF(CMAKE_SYSTEM_NAME STREQUAL "Linux") IF(NOT IGNORE_AIO_CHECK) diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index f846684896d..696d55cea69 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -37,7 +37,8 @@ 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 CACHE INTERNAL "") + OPTION(CPACK_RPM_DEBUGINFO_PACKAGE "" ON) + MARK_AS_ADVANCED(CPACK_RPM_DEBUGINFO_PACKAGE) ENDIF() SET(CPACK_RPM_PACKAGE_RELEASE "1%{?dist}") |