diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-03-03 12:29:34 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-03-03 12:29:34 +0100 |
| commit | 273d74eaa586117951113a372249c1cd0bbdb842 (patch) | |
| tree | cb883ffd7d056d99712bf0a248cbb068e96287d5 /cmake | |
| parent | 01ee0f967720c12e54f4156178ca87fd78d50be6 (diff) | |
| download | mariadb-git-273d74eaa586117951113a372249c1cd0bbdb842.tar.gz | |
Bug #51488 :missing features and change behavior in cmake runs compared to
autotools runs
- Fix recognition of --with-debug=full in configure wrapper
- Remove CMakeCache.txt in configure wrapper, to match the original
- Fix recognition of max-no-ndb
- Fix broken dependencies of mysql_fix_privilege_table.sql from
mysql_system_tables.sql and mysql_system_tables_fix.sql
- Add "distclean target" that informs user about appropriate bzr command
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/configure.pl | 6 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cmake/configure.pl b/cmake/configure.pl index 7f21810a8f2..fba417365fc 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -179,6 +179,11 @@ foreach my $option (@ARGV) $cmakeargs = $cmakeargs." -DMYSQL_DATADIR=".substr($option,14); next; } + if ($option =~ /with-debug=full/) + { + $cmakeargs = $cmakeargs." -DWITH_DEBUG_FULL=1"; + next; + } $option = uc($option); $option =~ s/-/_/g; @@ -186,5 +191,6 @@ foreach my $option (@ARGV) } print("configure.pl : calling cmake $srcdir $cmakeargs\n"); +unlink("CMakeCache.txt"); my $rc = system("cmake $srcdir $cmakeargs"); exit($rc); diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index d6411641192..30a7932a0d7 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -52,6 +52,11 @@ MACRO(MYSQL_ADD_PLUGIN) SET(WITH_${plugin} 1) ENDIF() + IF(WITH_MAX_NO_NDB) + SET(WITH_MAX 1) + SET(WITHOUT_NDBCLUSTER 1) + ENDIF() + IF(WITH_${plugin}_STORAGE_ENGINE OR WITH_{$plugin} OR WITH_ALL |