mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-207 Install headers required to build external storage plugins

Browse source 
5.5 version. for cmake, not autotools.
This commit is contained in:
Sergei Golubchik 2012-05-05 08:27:17 +02:00
parent 44cf9ee5f7
commit 91527014c2
5 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.bzrignore
View file

@ -1140,3 +1140,4 @@ libmysqld/gcalc_tools.cc
sql/share/errmsg.sys sql/share/errmsg.sys
sql/share/mysql sql/share/mysql
install_manifest.txt install_manifest.txt
sql/db.opt

3
debian/libmariadbclient-dev.files vendored
View file

@ -1,6 +1,5 @@
usr/bin/mysql_config usr/bin/mysql_config
usr/include/mysql/*.h usr/include/mysql
usr/include/mysql/psi/*.h
usr/lib/libmysqlclient.a usr/lib/libmysqlclient.a
usr/lib/libmysqlclient_r.a usr/lib/libmysqlclient_r.a
usr/lib/libmysqlservices.a usr/lib/libmysqlservices.a

23
include/CMakeLists.txt
View file

@ -14,11 +14,11 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET(HEADERS_GEN_CONFIGURE SET(HEADERS_GEN_CONFIGURE
${CMAKE_CURRENT_BINARY_DIR}/mysql_version.h mysql_version.h
${CMAKE_CURRENT_BINARY_DIR}/my_config.h my_config.h
${CMAKE_CURRENT_BINARY_DIR}/mysqld_ername.h mysqld_ername.h
${CMAKE_CURRENT_BINARY_DIR}/mysqld_error.h mysqld_error.h
${CMAKE_CURRENT_BINARY_DIR}/sql_state.h sql_state.h
) )
SET(HEADERS SET(HEADERS
@ -49,8 +49,19 @@ SET(HEADERS
m_ctype.h m_ctype.h
my_attribute.h my_attribute.h
my_compiler.h my_compiler.h
${HEADERS_GEN_CONFIGURE}
) )
INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) 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") 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)

2
regex/CMakeLists.txt
View file

@ -17,3 +17,5 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c) SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES}) ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)

6
sql/CMakeLists.txt
View file

@ -353,3 +353,9 @@ IF(WIN32)
COMPONENT Server) COMPONENT Server)
TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice) TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
ENDIF(WIN32) ENDIF(WIN32)
INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
FILES_MATCHING PATTERN "*.h"
PATTERN examples EXCLUDE
PATTERN share EXCLUDE
PATTERN CMakeFiles EXCLUDE)