diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 17:46:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 17:46:40 +0300 |
| commit | fae0ccad6ec391bf85c39070f784589d48e11951 (patch) | |
| tree | b6a20ffe8c11a13edce1f0c7c46eb9c5ac3d2bab /CMakeLists.txt | |
| parent | 1b558dd462d34e948f3a4d9e54af973e37a9746e (diff) | |
| parent | 620c55e708b9ea94ef8ba309267a6f2f32ed8104 (diff) | |
| download | mariadb-git-fae0ccad6ec391bf85c39070f784589d48e11951.tar.gz | |
Merge 10.5 into 10.6
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 eeee9f7e986..d5074a97503 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -418,14 +418,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) |