diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-20 09:31:13 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-20 09:31:13 +0100 |
| commit | 2fc3dc393d396647a220b286780f31d244ac2c53 (patch) | |
| tree | 51daa37fb127f8f77157548a51907fcd793463ae /cmake | |
| parent | e52c753ab9c3315ca4b5a645b66da807ec6d7821 (diff) | |
| parent | 1e156e1436f931625b7a5573584a786388979de2 (diff) | |
| download | mariadb-git-2fc3dc393d396647a220b286780f31d244ac2c53.tar.gz | |
Merge branch '10.1' into bb-10.1-serg
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/configure.pl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cmake/configure.pl b/cmake/configure.pl index b298ab11076..68baf436c1c 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -125,7 +125,7 @@ foreach my $option (@ARGV) foreach my $p (@plugins) { $p =~ s/-/_/g; - $cmakeargs = $cmakeargs." -DWITH_".uc($p)."=1"; + $cmakeargs = $cmakeargs." -DWITH_".uc($p)."=AUTO"; } next; } @@ -137,7 +137,12 @@ foreach my $option (@ARGV) } if($option =~ /without-plugin=/ || $option =~ /without-plugin-/) { - $cmakeargs = $cmakeargs." -DWITHOUT_".uc(substr($option,15))."=1"; + $cmakeargs = $cmakeargs." -DPLUGIN_".uc(substr($option,15))."=NO"; + next; + } + if($option =~ /with-plugin-(.*)=(.*)/) + { + $cmakeargs = $cmakeargs." -DPLUGIN_".uc($1)."=".uc($2); next; } if($option =~ /with-zlib-dir=bundled/) |