diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-02-22 16:26:44 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-02-22 16:26:44 +0100 |
| commit | c20979b16387ca9ddbf8ab9969c5d059ca7fd1a5 (patch) | |
| tree | a0f87ed5eebbe211a7ff970f660143c969dfde19 /CMakeLists.txt | |
| parent | d9c640aa8bfbdb079b7611cf71baf38133810674 (diff) | |
| download | mariadb-git-c20979b16387ca9ddbf8ab9969c5d059ca7fd1a5.tar.gz | |
MDEV-9601 Build client plugins, also for the cmake client-only build
(-DWITHOUT_SERVER=1)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d06f40d393..ab981bc330f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,11 +366,9 @@ IF(WITH_UNIT_TESTS) ENDIF() ENDIF() -IF(NOT WITHOUT_SERVER) - SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") - # Add storage engines and plugins. - CONFIGURE_PLUGINS() -ENDIF() +SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") +# Add storage engines and plugins. +CONFIGURE_PLUGINS() ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(dbug) @@ -400,6 +398,10 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(sql-bench) + IF(WIN32) + ADD_SUBDIRECTORY(win/upgrade_wizard) + ADD_SUBDIRECTORY(win/packaging) + ENDIF() ENDIF() IF(UNIX) @@ -409,10 +411,7 @@ ENDIF() INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -IF(WIN32) - ADD_SUBDIRECTORY(win/upgrade_wizard) - ADD_SUBDIRECTORY(win/packaging) -ENDIF() + INCLUDE(for_clients) |