diff options
| author | Jonathan Perkin <jperkin@sun.com> | 2010-02-24 19:19:24 +0000 |
|---|---|---|
| committer | Jonathan Perkin <jperkin@sun.com> | 2010-02-24 19:19:24 +0000 |
| commit | 26e77e002768c19226809561d09374568ea381b8 (patch) | |
| tree | 50f66da5147af74897064d2c984003ad1f9ea2b3 /cmake | |
| parent | 73b591a0b51ed618dd95ef716ddc99ac89fff891 (diff) | |
| download | mariadb-git-26e77e002768c19226809561d09374568ea381b8.tar.gz | |
Some CMake packaging fixes:
- Remove INSTALL-BINARY from installed docs directory, we provide a copy
in the root directory (but perhaps this should be revisited later).
- Disable audit_null and daemon_example plugins.
- Fix the docs directory.
- Remove mysql-test/Makefile.in
- Build and install mysql_tzinfo_to_sql
- Remove share/charsets/languages.html
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/build_configurations/mysql_release.cmake | 2 | ||||
| -rwxr-xr-x | cmake/install_layout.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake index 6834f006b6b..450ef9826c2 100644 --- a/cmake/build_configurations/mysql_release.cmake +++ b/cmake/build_configurations/mysql_release.cmake @@ -80,6 +80,8 @@ IF(FEATURE_SET) ENDFOREACH() ENDIF() +SET(WITHOUT_AUDIT_NULL ON CACHE BOOL "") +SET(WITHOUT_DAEMON_EXAMPLE ON CACHE BOOL "") OPTION(ENABLE_LOCAL_INFILE "" ON) SET(WITH_SSL bundled CACHE STRING "") diff --git a/cmake/install_layout.cmake b/cmake/install_layout.cmake index 7a0d34d6a17..92eebebd4e2 100755 --- a/cmake/install_layout.cmake +++ b/cmake/install_layout.cmake @@ -80,7 +80,7 @@ ENDIF() SET(INSTALL_LIBDIR_STANDALONE "lib") SET(INSTALL_INCLUDEDIR_STANDALONE "include") SET(INSTALL_PLUGINDIR_STANDALONE "lib/plugin") - SET(INSTALL_DOCDIR_STANDALONE "doc") + SET(INSTALL_DOCDIR_STANDALONE "docs") SET(INSTALL_MANDIR_STANDALONE "man") SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share") SET(INSTALL_SHAREDIR_STANDALONE "share") |