diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-25 18:19:55 +0100 |
| commit | 00d1db7a38b17d4512a6ba5147926608aca5624d (patch) | |
| tree | c2b28145304e9eacf79fcabaeb962a20d79fec93 /CMakeLists.txt | |
| parent | 0485328d030f4b742dac7b667e8ed099beb9e9f2 (diff) | |
| parent | 0251232f8c3bca33b4dd15d6668105f3de9d024d (diff) | |
| download | mariadb-git-00d1db7a38b17d4512a6ba5147926608aca5624d.tar.gz | |
Merge branch '10.1' into 10.2
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 0584492def3..5f8ae5b2d9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,11 +348,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) @@ -382,6 +380,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) @@ -391,10 +393,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) |