diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 11:33:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 11:33:59 +0300 |
| commit | 394784095eeedb3a2915249fe14a9d2e1f91a23a (patch) | |
| tree | 0a2e7ad98bfa382744d87c6af6eb91f4bfc3858d /CMakeLists.txt | |
| parent | d7189fbcb4dadf23d615a5f3a26aba1d4e37178f (diff) | |
| parent | 4730314a70119ae5857edffe2d1bec86960ef22b (diff) | |
| download | mariadb-git-394784095eeedb3a2915249fe14a9d2e1f91a23a.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a135b0f8e3..94b459c583b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -404,14 +404,12 @@ IF(WITH_UNIT_TESTS) ENDIF() ENDIF() -INCLUDE(cpack_tgz) -INCLUDE(cpack_rpm) -INCLUDE(cpack_deb) UNSET (MYSQLD_STATIC_PLUGIN_LIBS CACHE) INCLUDE(mariadb_connector_c) # this does ADD_SUBDIRECTORY(libmariadb) +INCLUDE(cpack_tgz) INCLUDE(cpack_rpm) INCLUDE(cpack_deb) |