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 /cmake | |
| 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 'cmake')
| -rw-r--r-- | cmake/plugin.cmake | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index cd02bcfc4be..da1acc4b83e 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -28,12 +28,15 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_parse_arguments.cmake) # [LINK_LIBRARIES lib1...libN] # [DEPENDENCIES target1...targetN] -MACRO(MYSQL_ADD_PLUGIN) +FUNCTION(MYSQL_ADD_PLUGIN) MYSQL_PARSE_ARGUMENTS(ARG "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG" "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;CLIENT" ${ARGN} ) + IF(WITHOUT_SERVER AND NOT ARG_CLIENT) + RETURN() + ENDIF() # Add common include directories INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include @@ -235,14 +238,16 @@ MACRO(MYSQL_ADD_PLUGIN) IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/mysql-test") INSTALL_MYSQL_TEST("${CMAKE_CURRENT_SOURCE_DIR}/mysql-test/" "plugin/${subpath}") ENDIF() - -ENDMACRO() +ENDFUNCTION() # Add all CMake projects under storage and plugin # subdirectories, configure sql_builtins.cc MACRO(CONFIGURE_PLUGINS) - FILE(GLOB dirs_storage ${CMAKE_SOURCE_DIR}/storage/*) + IF(NOT WITHOUT_SERVER) + FILE(GLOB dirs_storage ${CMAKE_SOURCE_DIR}/storage/*) + ENDIF() + FILE(GLOB dirs_plugin ${CMAKE_SOURCE_DIR}/plugin/*) FOREACH(dir ${dirs_storage} ${dirs_plugin}) IF (EXISTS ${dir}/CMakeLists.txt) |