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
fd717fb5
Commit
fd717fb5
authored
Jun 01, 2011
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #12607800 ADD HOOK TO INSTALL TESTS FROM IMPORTED FEATURE TREES
Sets INSTALL_PLUGINTESTDIR if any plugin/*/tests exist
parent
46c2089d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
cmake/install_layout.cmake
cmake/install_layout.cmake
+12
-1
No files found.
cmake/install_layout.cmake
View file @
fd717fb5
...
@@ -98,6 +98,13 @@ IF(UNIX)
...
@@ -98,6 +98,13 @@ IF(UNIX)
MARK_AS_ADVANCED
(
SYSCONFDIR
)
MARK_AS_ADVANCED
(
SYSCONFDIR
)
ENDIF
()
ENDIF
()
#
# plugin_tests's value should not be used by imported plugins,
# just use if(INSTALL_PLUGINTESTDIR).
# The plugin must set its own install path for tests
#
FILE
(
GLOB plugin_tests plugin/*/tests
)
#
#
# STANDALONE layout
# STANDALONE layout
#
#
...
@@ -122,6 +129,7 @@ SET(INSTALL_SQLBENCHDIR_STANDALONE ".")
...
@@ -122,6 +129,7 @@ SET(INSTALL_SQLBENCHDIR_STANDALONE ".")
SET
(
INSTALL_SUPPORTFILESDIR_STANDALONE
"support-files"
)
SET
(
INSTALL_SUPPORTFILESDIR_STANDALONE
"support-files"
)
#
#
SET
(
INSTALL_MYSQLDATADIR_STANDALONE
"data"
)
SET
(
INSTALL_MYSQLDATADIR_STANDALONE
"data"
)
SET
(
INSTALL_PLUGINTESTDIR_STANDALONE
${
plugin_tests
}
)
#
#
# RPM layout
# RPM layout
...
@@ -152,6 +160,7 @@ SET(INSTALL_SQLBENCHDIR_RPM "")
...
@@ -152,6 +160,7 @@ SET(INSTALL_SQLBENCHDIR_RPM "")
SET
(
INSTALL_SUPPORTFILESDIR_RPM
"share/mysql"
)
SET
(
INSTALL_SUPPORTFILESDIR_RPM
"share/mysql"
)
#
#
SET
(
INSTALL_MYSQLDATADIR_RPM
"/var/lib/mysql"
)
SET
(
INSTALL_MYSQLDATADIR_RPM
"/var/lib/mysql"
)
SET
(
INSTALL_PLUGINTESTDIR_RPM
${
plugin_tests
}
)
#
#
# DEB layout
# DEB layout
...
@@ -177,6 +186,7 @@ SET(INSTALL_SQLBENCHDIR_DEB ".")
...
@@ -177,6 +186,7 @@ SET(INSTALL_SQLBENCHDIR_DEB ".")
SET
(
INSTALL_SUPPORTFILESDIR_DEB
"support-files"
)
SET
(
INSTALL_SUPPORTFILESDIR_DEB
"support-files"
)
#
#
SET
(
INSTALL_MYSQLDATADIR_DEB
"data"
)
SET
(
INSTALL_MYSQLDATADIR_DEB
"data"
)
SET
(
INSTALL_PLUGINTESTDIR_DEB
${
plugin_tests
}
)
#
#
# SVR4 layout
# SVR4 layout
...
@@ -202,6 +212,7 @@ SET(INSTALL_SQLBENCHDIR_SVR4 ".")
...
@@ -202,6 +212,7 @@ SET(INSTALL_SQLBENCHDIR_SVR4 ".")
SET
(
INSTALL_SUPPORTFILESDIR_SVR4
"support-files"
)
SET
(
INSTALL_SUPPORTFILESDIR_SVR4
"support-files"
)
#
#
SET
(
INSTALL_MYSQLDATADIR_SVR4
"/var/lib/mysql"
)
SET
(
INSTALL_MYSQLDATADIR_SVR4
"/var/lib/mysql"
)
SET
(
INSTALL_PLUGINTESTDIR_SVR4
${
plugin_tests
}
)
# Clear cached variables if install layout was changed
# Clear cached variables if install layout was changed
...
@@ -216,7 +227,7 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE INTERNAL "")
...
@@ -216,7 +227,7 @@ SET(OLD_INSTALL_LAYOUT ${INSTALL_LAYOUT} CACHE INTERNAL "")
# will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
# will be defined as ${INSTALL_BINDIR_STANDALONE} by default if STANDALONE
# layout is chosen)
# layout is chosen)
FOREACH
(
var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
FOREACH
(
var BIN SBIN LIB MYSQLSHARE SHARE PLUGIN INCLUDE SCRIPT DOC MAN
INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA
)
INFO MYSQLTEST SQLBENCH DOCREADME SUPPORTFILES MYSQLDATA
PLUGINTEST
)
SET
(
INSTALL_
${
var
}
DIR
${
INSTALL_
${
var
}
DIR_
${
INSTALL_LAYOUT
}}
SET
(
INSTALL_
${
var
}
DIR
${
INSTALL_
${
var
}
DIR_
${
INSTALL_LAYOUT
}}
CACHE STRING
"
${
var
}
installation directory"
${
FORCE
}
)
CACHE STRING
"
${
var
}
installation directory"
${
FORCE
}
)
MARK_AS_ADVANCED
(
INSTALL_
${
var
}
DIR
)
MARK_AS_ADVANCED
(
INSTALL_
${
var
}
DIR
)
...
...
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