Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
c20979b1
Commit
c20979b1
authored
Feb 22, 2016
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-9601 Build client plugins, also for the cmake client-only build
(-DWITHOUT_SERVER=1)
parent
d9c640aa
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
13 deletions
+17
-13
CMakeLists.txt
CMakeLists.txt
+8
-9
cmake/plugin.cmake
cmake/plugin.cmake
+9
-4
No files found.
CMakeLists.txt
View file @
c20979b1
...
...
@@ -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
)
...
...
cmake/plugin.cmake
View file @
c20979b1
...
...
@@ -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
)
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment