diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-06-23 12:09:00 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-06-23 17:39:13 +0200 |
| commit | 787ec317784d58ca00c0c8e772173c66c5145f50 (patch) | |
| tree | 3c46c110880a481341ba0cd40d54ce3af7ddea3d /extra/CMakeLists.txt | |
| parent | da9bb66b028da9ef716de7325a5a91fa6216c217 (diff) | |
| download | mariadb-git-787ec317784d58ca00c0c8e772173c66c5145f50.tar.gz | |
MDEV-6248 GUI-friendly cmake options to enable/disable plugins
* Introduce a set of PLUGIN_xxx cmake options with values
NO, STATIC, DYNAMIC, AUTO, YES (abort if plugin is not compiled)
* Deprecate redundant and ambiguous WITH_xxx, WITH_PLUGIN_xxx,
WITH_xxx_STORAGE_ENGINE, WITHOUT_xxx, WITHOUT_PLUGIN_xxx,
WITHOUT_xxx_STORAGE_ENGINE
* Actually check whether a plugin is disabled (DISABLED keyword was
always present, but it was ignored until now).
* Support conditionally disabled plugins - keyword ONLY_IF
* Use ONLY_IF for conditionally skipping plugins, instead of
doing MYSQL_ADD_PLUGIN conditionally as before. Because if
MYSQL_ADD_PLUGIN isn't done at all, PLUGIN_xxx=YES cannot work.
Diffstat (limited to 'extra/CMakeLists.txt')
| -rw-r--r-- | extra/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index cf3a35cb1dd..50db83f2777 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -72,7 +72,7 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") ENDIF() ENDIF() -IF(WITH_INNOBASE_STORAGE_ENGINE) +IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_XTRADB_STORAGE_ENGINE) # Add path to the InnoDB headers INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include) # We use the InnoDB code directly in case the code changes. |