diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-12 12:45:06 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-12 12:45:06 +0300 |
| commit | 7896503686477cce55d058d071d2858a8abf4b04 (patch) | |
| tree | a926d002e4bf30ef245fea290c13f47bd25e5098 /cmake | |
| parent | 1d48c4a025e0ffb9bbe4a03388c08602d87fa5fc (diff) | |
| parent | 4dc10ec68d354241768ce4779c024b4bb2ca897b (diff) | |
| download | mariadb-git-7896503686477cce55d058d071d2858a8abf4b04.tar.gz | |
Merge 10.3 into 10.4bb-10.4-supermergejan
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/cpack_rpm.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 87c5518de6b..db377184499 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -277,7 +277,6 @@ IF(CMAKE_VERSION VERSION_GREATER "3.9.99") SET(CPACK_SOURCE_GENERATOR "RPM") SETA(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS - "-DBUILD_CONFIG=mysql_release" "-DRPM=${RPM}" "-DCPACK_RPM_BUILD_SOURCE_DIRS_PREFIX=/usr/src/debug/${CPACK_RPM_PACKAGE_NAME}-${VERSION}" ) @@ -288,6 +287,7 @@ MACRO(ADDIF var) ENDIF() ENDMACRO() +ADDIF(CMAKE_BUILD_TYPE) ADDIF(BUILD_CONFIG) ADDIF(WITH_SSL) |