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
91527014
Commit
91527014
authored
12 years ago
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-207 Install headers required to build external storage plugins
5.5 version. for cmake, not autotools.
parent
44cf9ee5
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
8 deletions
+27
-8
.bzrignore
.bzrignore
+1
-0
debian/libmariadbclient-dev.files
debian/libmariadbclient-dev.files
+1
-2
include/CMakeLists.txt
include/CMakeLists.txt
+17
-6
regex/CMakeLists.txt
regex/CMakeLists.txt
+2
-0
sql/CMakeLists.txt
sql/CMakeLists.txt
+6
-0
No files found.
.bzrignore
View file @
91527014
...
...
@@ -1140,3 +1140,4 @@ libmysqld/gcalc_tools.cc
sql/share/errmsg.sys
sql/share/mysql
install_manifest.txt
sql/db.opt
This diff is collapsed.
Click to expand it.
debian/libmariadbclient-dev.files
View file @
91527014
usr/bin/mysql_config
usr/include/mysql/*.h
usr/include/mysql/psi/*.h
usr/include/mysql
usr/lib/libmysqlclient.a
usr/lib/libmysqlclient_r.a
usr/lib/libmysqlservices.a
...
...
This diff is collapsed.
Click to expand it.
include/CMakeLists.txt
View file @
91527014
...
...
@@ -14,11 +14,11 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET
(
HEADERS_GEN_CONFIGURE
${
CMAKE_CURRENT_BINARY_DIR
}
/
mysql_version.h
${
CMAKE_CURRENT_BINARY_DIR
}
/
my_config.h
${
CMAKE_CURRENT_BINARY_DIR
}
/
mysqld_ername.h
${
CMAKE_CURRENT_BINARY_DIR
}
/
mysqld_error.h
${
CMAKE_CURRENT_BINARY_DIR
}
/
sql_state.h
mysql_version.h
my_config.h
mysqld_ername.h
mysqld_error.h
sql_state.h
)
SET
(
HEADERS
...
...
@@ -49,8 +49,19 @@ SET(HEADERS
m_ctype.h
my_attribute.h
my_compiler.h
${
HEADERS_GEN_CONFIGURE
}
)
INSTALL
(
FILES
${
HEADERS
}
DESTINATION
${
INSTALL_INCLUDEDIR
}
COMPONENT Development
)
FOREACH
(
f
${
HEADERS_GEN_CONFIGURE
}
)
INSTALL
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/
${
f
}
DESTINATION
${
INSTALL_INCLUDEDIR
}
COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
)
ENDFOREACH
(
f
)
INSTALL
(
DIRECTORY mysql/ DESTINATION
${
INSTALL_INCLUDEDIR
}
COMPONENT Development FILES_MATCHING PATTERN
"*.h"
)
STRING
(
REPLACE
"."
"
\\
."
EXCL_RE
"
${
HEADERS
}
;
${
HEADERS_GEN_CONFIGURE
}
"
)
STRING
(
REPLACE
";"
"|"
EXCL_RE
"
${
EXCL_RE
}
"
)
INSTALL
(
DIRECTORY . DESTINATION
${
INSTALL_INCLUDEDIR
}
/private COMPONENT Development
FILES_MATCHING PATTERN
"*.h"
PATTERN CMakeFiles EXCLUDE
PATTERN mysql EXCLUDE
REGEX
"
\\
./(
${
EXCL_RE
}
$)"
EXCLUDE
)
This diff is collapsed.
Click to expand it.
regex/CMakeLists.txt
View file @
91527014
...
...
@@ -17,3 +17,5 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
SET
(
REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c
)
ADD_CONVENIENCE_LIBRARY
(
regex
${
REGEX_SOURCES
}
)
INSTALL
(
FILES
"my_regex.h"
DESTINATION
${
INSTALL_INCLUDEDIR
}
/private COMPONENT Development
)
This diff is collapsed.
Click to expand it.
sql/CMakeLists.txt
View file @
91527014
...
...
@@ -353,3 +353,9 @@ IF(WIN32)
COMPONENT Server
)
TARGET_LINK_LIBRARIES
(
mysql_upgrade_service mysys winservice
)
ENDIF
(
WIN32
)
INSTALL
(
DIRECTORY . DESTINATION
${
INSTALL_INCLUDEDIR
}
/private COMPONENT Development
FILES_MATCHING PATTERN
"*.h"
PATTERN examples EXCLUDE
PATTERN share EXCLUDE
PATTERN CMakeFiles EXCLUDE
)
This diff is collapsed.
Click to expand it.
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