summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.4' into 10.5Oleksandr Byelkin2022-02-011-0/+4
|\
| * Merge branch '10.3' into 10.4Oleksandr Byelkin2022-01-301-0/+4
| |\
| | * Merge branch '10.2' into 10.3mariadb-10.3.33Oleksandr Byelkin2022-01-291-0/+4
| | |\
| | | * MDEV-14938 make buildbot to include galera into bintarsSergei Golubchik2022-01-071-0/+1
| * | | Add new option NOT_EMBEDDED, for pluginsVladislav Vaintroub2021-11-091-1/+1
| * | | Merge branch '10.3' into 10.4Vladislav Vaintroub2021-09-111-0/+37
| |\ \ \ | | |/ /
* | | | Made optional Json_writer_object / Json_writer_array consistency checkSergei Krivonos2021-10-171-0/+4
* | | | Use mariadb- named targets for minbuildVladislav Vaintroub2021-09-111-15/+16
* | | | Merge branch '10.4' into 10.5Vladislav Vaintroub2021-09-111-0/+37
|\ \ \ \
| * \ \ \ Merge branch '10.3' into 10.4Vladislav Vaintroub2021-09-111-0/+37
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch '10.2' into 10.3Vladislav Vaintroub2021-09-111-0/+37
| | |\ \ | | | |/
| | | * Define minbuild target for 10.2Vladislav Vaintroub2021-09-111-0/+37
* | | | Merge remote-tracking branch 'upstream/10.4' into 10.5Vicențiu Ciorbaru2021-09-101-1/+2
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'upstream/10.3' into 10.4Vicențiu Ciorbaru2021-09-091-1/+2
| |\ \ \ | | |/ /
| | * | Merge branch '10.2' into 10.3Vicențiu Ciorbaru2021-09-071-1/+2
| | |\ \ | | | |/
| | | * disable cmake feature summary after the first runSergei Golubchik2021-09-061-1/+2
* | | | Merge branch '10.4' into 10.5Oleksandr Byelkin2021-07-311-5/+16
|\ \ \ \ | |/ / /
| * | | Merge branch '10.3' into 10.4Oleksandr Byelkin2021-07-311-5/+16
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-07-221-5/+16
| | |\ \ | | | |/
| | | * Add feature summary at the end of cmake.Heinz Wiesinger2021-07-211-3/+14
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-05-261-0/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-05-251-0/+2
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-05-241-0/+2
| | |\ \ | | | |/
| | | * cmake: fewer Build-Depends in SRPMSergei Golubchik2021-05-221-0/+2
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-05-101-11/+12
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-05-101-11/+12
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-05-101-11/+12
| | |\ \ | | | |/
| | | * MDEV-25232 Ninja MSVC build sets default CMAKE_BUILD_TYPE to DebugVladislav Vaintroub2021-05-091-11/+12
* | | | Merge branch bb-10.4-release into bb-10.5-releasemariadb-10.5.10Nikita Malyavin2021-05-051-14/+13
|\ \ \ \ | |/ / /
| * | | Merge branch bb-10.3-release into bb-10.4-releaseNikita Malyavin2021-05-051-14/+13
| |\ \ \ | | |/ /
| | * | Merge branch bb-10.2-release into bb-10.3-releaseNikita Malyavin2021-05-041-14/+13
| | |\ \ | | | |/
| | | * MDEV-25232 - CMake deprecation warning about CMAKE_MINIMUM_REQUIRED < 2.8.12Vladislav Vaintroub2021-04-281-14/+13
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-251-2/+1
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4bb-10.4-mergeMarko Mäkelä2021-04-251-2/+1
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-04-241-2/+1
| | |\ \ | | | |/
| | | * remove EXCEPTIONS-CLIENTSergei Golubchik2021-04-231-2/+1
* | | | Fix cross-compile to consider CMAKE_CROSSCOMPILING_EMULATORbb-10.5-danielblack-pr1805-cross-compileJustin Jagieniak2021-04-151-2/+2
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-04-141-2/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-04-141-2/+2
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-04-141-2/+2
| | |\ \ | | | |/
| | | * -DMYSQL_MAINTAINER_MODE=NOSergei Golubchik2021-04-131-1/+1
* | | | Merge 10.4 into 10.5Marko Mäkelä2021-03-271-9/+5
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2021-03-271-9/+5
| |\ \ \ | | |/ /
| | * | Merge 10.2 into 10.3Marko Mäkelä2021-03-271-9/+5
| | |\ \ | | | |/
| | | * cmake cleanup: drop support for ancient clang in WITH_ASAN optionEugene Kosov2021-03-261-10/+0
| | | * MDEV-25238 add support for -fsanitize-address-use-after-scopeEugene Kosov2021-03-261-0/+6
| | | * MDEV-24034 Policy CMP0075 is not set during compileVladislav Vaintroub2020-12-151-0/+3
* | | | Added support of WITH_GPROF to cmakeMonty2020-08-201-1/+6
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-07-201-1/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2020-07-201-1/+2
| |\ \ \ | | |/ /