diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-04-12 11:55:18 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-04-12 11:55:18 +0300 |
| commit | 6a645dd02a0b88002d309043f39a62a641759621 (patch) | |
| tree | 90734e435aa829508bbe897b43a0a3f94d9a8393 | |
| parent | 71848585f81690babb70cba345719a5d178b00d7 (diff) | |
| parent | a05f423554d0825997c1ff3de7e49e981e84e882 (diff) | |
| download | mariadb-git-bb-10.4-janmerge.tar.gz | |
Merge remote-tracking branch 'origin/10.3' into bb-10.4-janmergebb-10.4-janmerge
| -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) |