diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-03-29 10:58:20 +0100 |
| commit | f2a0c758da3d9f0fa42c96114b453cf4835bcbab (patch) | |
| tree | d51cdc29774cfc04f522e2253542d73c94a9728b /cmake/plugin.cmake | |
| parent | fc168c3a5e58d8b364a2e87e0d876a261ec7fced (diff) | |
| parent | d0116e10a5da52503a89a413e481996ce3f65e63 (diff) | |
| download | mariadb-git-f2a0c758da3d9f0fa42c96114b453cf4835bcbab.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'cmake/plugin.cmake')
| -rw-r--r-- | cmake/plugin.cmake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 65e85983d68..268bc6e4a63 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -233,9 +233,6 @@ MACRO(MYSQL_ADD_PLUGIN) IF (NOT ARG_CLIENT) SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server${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 UNIX) IF (NOT ARG_CONFIG) |