diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-08 13:38:36 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-08 13:38:36 +0200 |
| commit | 985f63cce1057d7b3fd6e86e65a2a2ee7d970073 (patch) | |
| tree | b517479e6778d1701f123b842233a6015bdf12c1 /CMakeLists.txt | |
| parent | e84c62d59b8036138998b0e521a47bdde4ac3875 (diff) | |
| parent | 530da97c65a8018ef049dfb990df6b98bc5e4ccd (diff) | |
| download | mariadb-git-985f63cce1057d7b3fd6e86e65a2a2ee7d970073.tar.gz | |
Merge branch '10.1' into 10.2mariadb-10.2.32
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 99120f16d4c..097d79fa5e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,8 +144,6 @@ INCLUDE(mysql_version) INCLUDE(cpack_source_ignore_files) INCLUDE(install_layout) INCLUDE(wsrep) -INCLUDE(cpack_rpm) -INCLUDE(cpack_deb) # Add macros INCLUDE(character_sets) @@ -390,6 +388,9 @@ IF(WITH_UNIT_TESTS) ENDIF() ENDIF() +INCLUDE(cpack_rpm) +INCLUDE(cpack_deb) + SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") INCLUDE(submodules) |