diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:20:20 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-21 10:20:20 +0300 |
| commit | 28f01f82e1cb682566017b52017469be7638dd49 (patch) | |
| tree | d496cb0936d25973b95f6eb591508c2e493032b8 /cmake/configure.pl | |
| parent | a3099a3b4a394da360b5c1e7ae6dc985ae2f7f2f (diff) | |
| parent | 80ed136e6dd4a021b1fc9b7bd7077bf989c3d247 (diff) | |
| download | mariadb-git-bb-10.6-merge.tar.gz | |
WIP merge 10.5 to 10.6bb-10.6-merge
FIXME: Disabled tests due to upgrading libmariadb:
main.mysql_client_test main.mysql_client_test_nonblock main.mysql_client_test_comp
Diffstat (limited to 'cmake/configure.pl')
| -rw-r--r-- | cmake/configure.pl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cmake/configure.pl b/cmake/configure.pl index c296c5ba4b8..4085110b6fa 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -93,6 +93,11 @@ foreach my $option (@ARGV) { $option = substr($option, 2); } + elsif (substr ($option, 0, 2) eq "-D") + { + # Must be cmake config option + $option = substr($option, 1); + } else { # This must be environment variable @@ -119,6 +124,11 @@ foreach my $option (@ARGV) $just_print=1; next; } + if ($option =~ /D.*=/) + { + $cmakeargs = $cmakeargs." -".$option; + next; + } if($option =~ /with-plugins=/) { my @plugins= split(/,/, substr($option,13)); |