summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-03-16 19:27:51 +0100
committerSergei Golubchik <serg@mariadb.org>2019-03-27 22:51:37 +0100
commit6417297180c7bc9242037894e21b769b7c22ead3 (patch)
treed799821606c62862601a5aeca9cabc00353cca57 /cmake
parentf97d879bf890fe1d93c459f46410e2be8d26d3b6 (diff)
downloadmariadb-git-6417297180c7bc9242037894e21b769b7c22ead3.tar.gz
cmake: remove workarounds for cmake bugs #13248 and #12864
since long we use a different workaround, our own CPackRPM wrapper
Diffstat (limited to 'cmake')
-rw-r--r--cmake/plugin.cmake3
1 files changed, 0 insertions, 3 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index e38439f2a21..4396a0a6c25 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN)
IF (NOT ARG_CLIENT)
SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB${ver}" PARENT_SCOPE)
ENDIF()
- # workarounds for cmake issues #13248 and #12864:
- SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE)
- SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE)
SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE)
IF(NOT ARG_CLIENT AND NOT ARG_CONFIG AND UNIX)
SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${target}.cnf")