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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
1a4998e9
Commit
1a4998e9
authored
Mar 23, 2020
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-21303 postfixes
parent
5d1b8f41
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
cmake/install_macros.cmake
cmake/install_macros.cmake
+1
-1
sql/CMakeLists.txt
sql/CMakeLists.txt
+3
-3
No files found.
cmake/install_macros.cmake
View file @
1a4998e9
...
@@ -38,7 +38,7 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS)
...
@@ -38,7 +38,7 @@ FUNCTION (INSTALL_DEBUG_SYMBOLS)
ENDIF
()
ENDIF
()
set
(
comp
""
)
set
(
comp
""
)
IF
((
target STREQUAL
"m
ysql
d"
))
IF
((
target STREQUAL
"m
ariadb
d"
))
SET
(
comp Server
)
SET
(
comp Server
)
ENDIF
()
ENDIF
()
...
...
sql/CMakeLists.txt
View file @
1a4998e9
...
@@ -434,7 +434,7 @@ ADD_CUSTOM_TARGET(distclean
...
@@ -434,7 +434,7 @@ ADD_CUSTOM_TARGET(distclean
)
)
# Install initial database (default on windows, optional target elsewhere)
# Install initial database (default on windows, optional target elsewhere)
IF
(
TARGET m
ysql
d AND NOT CMAKE_CROSSCOMPILING
)
IF
(
TARGET m
ariadb
d AND NOT CMAKE_CROSSCOMPILING
)
IF
(
GENERATOR_IS_MULTI_CONFIG
)
IF
(
GENERATOR_IS_MULTI_CONFIG
)
SET
(
CONFIG_PARAM -DCONFIG=
${
CMAKE_CFG_INTDIR
}
)
SET
(
CONFIG_PARAM -DCONFIG=
${
CMAKE_CFG_INTDIR
}
)
ENDIF
()
ENDIF
()
...
@@ -447,12 +447,12 @@ IF(TARGET mysqld AND NOT CMAKE_CROSSCOMPILING)
...
@@ -447,12 +447,12 @@ IF(TARGET mysqld AND NOT CMAKE_CROSSCOMPILING)
${
CONFIG_PARAM
}
${
CONFIG_PARAM
}
-DTOP_SRCDIR=
"
${
CMAKE_SOURCE_DIR
}
"
-DTOP_SRCDIR=
"
${
CMAKE_SOURCE_DIR
}
"
-DBINDIR=
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
-DBINDIR=
"
${
CMAKE_CURRENT_BINARY_DIR
}
"
-DMYSQLD_EXECUTABLE=
"$<TARGET_FILE:m
ysql
d>"
-DMYSQLD_EXECUTABLE=
"$<TARGET_FILE:m
ariadb
d>"
-DCMAKE_CFG_INTDIR=
"
${
CMAKE_CFG_INTDIR
}
"
-DCMAKE_CFG_INTDIR=
"
${
CMAKE_CFG_INTDIR
}
"
-P
${
CMAKE_SOURCE_DIR
}
/cmake/create_initial_db.cmake
-P
${
CMAKE_SOURCE_DIR
}
/cmake/create_initial_db.cmake
COMMAND
${
CMAKE_COMMAND
}
-E touch
${
CMAKE_CURRENT_BINARY_DIR
}
/initdb.dep
COMMAND
${
CMAKE_COMMAND
}
-E touch
${
CMAKE_CURRENT_BINARY_DIR
}
/initdb.dep
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
/
DEPENDS m
ysql
d
DEPENDS m
ariadb
d
)
)
IF
(
WIN32
)
IF
(
WIN32
)
SET
(
ALL_ON_WINDOWS ALL
)
SET
(
ALL_ON_WINDOWS ALL
)
...
...
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