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
4937765c
Commit
4937765c
authored
Dec 19, 2010
by
Sven Sandberg
Browse files
Options
Browse Files
Download
Plain Diff
Merged BUG#49978 with (BUG#51264 + BUG#51925) in 5.5-bugteam.
parents
fb5c33f5
6c70c33f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
12 deletions
+7
-12
include/CMakeLists.txt
include/CMakeLists.txt
+1
-3
scripts/mysql_config.sh
scripts/mysql_config.sh
+5
-1
support-files/CMakeLists.txt
support-files/CMakeLists.txt
+1
-8
No files found.
include/CMakeLists.txt
View file @
4937765c
...
@@ -59,6 +59,4 @@ SET(HEADERS
...
@@ -59,6 +59,4 @@ SET(HEADERS
)
)
INSTALL
(
FILES
${
HEADERS
}
DESTINATION
${
INSTALL_INCLUDEDIR
}
COMPONENT Development
)
INSTALL
(
FILES
${
HEADERS
}
DESTINATION
${
INSTALL_INCLUDEDIR
}
COMPONENT Development
)
INSTALL
(
DIRECTORY mysql/ DESTINATION
${
INSTALL_INCLUDEDIR
}
COMPONENT Development FILES_MATCHING PATTERN
"*.h"
)
INSTALL
(
DIRECTORY mysql/ DESTINATION
${
INSTALL_INCLUDEDIR
}
/mysql COMPONENT Development FILES_MATCHING PATTERN
"*.h"
)
scripts/mysql_config.sh
View file @
4937765c
...
@@ -92,7 +92,11 @@ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
...
@@ -92,7 +92,11 @@ plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
fix_path plugindir
$plugindir_rel
lib/mysql/plugin lib/plugin
fix_path plugindir
$plugindir_rel
lib/mysql/plugin lib/plugin
pkgincludedir
=
'@pkgincludedir@'
pkgincludedir
=
'@pkgincludedir@'
fix_path pkgincludedir include/mysql include
if
[
-f
"
$basedir
/include/mysql/mysql.h"
]
;
then
pkgincludedir
=
"
$basedir
/include/mysql"
elif
[
-f
"
$basedir
/include/mysql.h"
]
;
then
pkgincludedir
=
"
$basedir
/include"
fi
version
=
'@VERSION@'
version
=
'@VERSION@'
socket
=
'@MYSQL_UNIX_ADDR@'
socket
=
'@MYSQL_UNIX_ADDR@'
...
...
support-files/CMakeLists.txt
View file @
4937765c
...
@@ -48,14 +48,7 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
...
@@ -48,14 +48,7 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
ENDFOREACH
()
ENDFOREACH
()
IF
(
UNIX
)
IF
(
UNIX
)
# XXX: again, used elsewhere (scripts/), should be standardised in
# XXX: install_layout.cmake
IF
(
INSTALL_LAYOUT MATCHES
"STANDALONE"
)
SET
(
prefix
"."
)
ELSE
()
SET
(
prefix
${
CMAKE_INSTALL_PREFIX
}
)
SET
(
prefix
${
CMAKE_INSTALL_PREFIX
}
)
ENDIF
()
FOREACH
(
script mysqld_multi.server mysql-log-rotate binary-configure
FOREACH
(
script mysqld_multi.server mysql-log-rotate binary-configure
config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini
)
config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini
)
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
script
}
.sh
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
script
}
.sh
...
...
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