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
fb8818c1
Commit
fb8818c1
authored
Jun 17, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix CMakeLists.txt for cmake Ninja generator
parent
dc64ba21
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
cmake/install_macros.cmake
cmake/install_macros.cmake
+1
-1
cmake/plugin.cmake
cmake/plugin.cmake
+1
-1
scripts/CMakeLists.txt
scripts/CMakeLists.txt
+1
-1
No files found.
cmake/install_macros.cmake
View file @
fb8818c1
...
...
@@ -312,7 +312,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
MESSAGE
(
FATAL_ERROR
"Need DESTINATION parameter for INSTALL_DEBUG_TARGET"
)
ENDIF
()
GET_TARGET_PROPERTY
(
target_location
${
target
}
LOCATION
)
IF
(
CMAKE_GENERATOR MATCHES
"Makefiles"
)
IF
(
CMAKE_GENERATOR MATCHES
"Makefiles
|Ninja
"
)
STRING
(
REPLACE
"
${
CMAKE_BINARY_DIR
}
"
"
${
DEBUGBUILDDIR
}
"
debug_target_location
"
${
target_location
}
"
)
ELSE
()
STRING
(
REPLACE
"
${
CMAKE_CFG_INTDIR
}
"
"Debug"
debug_target_location
"
${
target_location
}
"
)
...
...
cmake/plugin.cmake
View file @
fb8818c1
...
...
@@ -108,7 +108,7 @@ MACRO(MYSQL_ADD_PLUGIN)
# Build either static library or module
IF
(
WITH_
${
plugin
}
AND NOT ARG_MODULE_ONLY
)
IF
(
CMAKE_GENERATOR MATCHES
"Makefiles"
)
IF
(
CMAKE_GENERATOR MATCHES
"Makefiles
|Ninja
"
)
# If there is a shared library from previous shared build,
# remove it. This is done just for mysql-test-run.pl
# so it does not try to use stale shared lib as plugin
...
...
scripts/CMakeLists.txt
View file @
fb8818c1
...
...
@@ -88,7 +88,7 @@ IF(MALLOC_LIB)
INSTALL
(
FILES
${
MALLOC_LIB
}
DESTINATION
${
INSTALL_LIBDIR
}
OPTIONAL
)
ENDIF
()
IF
(
CMAKE_GENERATOR MATCHES
"Makefiles"
)
IF
(
CMAKE_GENERATOR MATCHES
"Makefiles
|Ninja
"
)
# Strip maintainer mode options if necessary
STRING
(
REPLACE
"
${
MY_MAINTAINER_C_WARNINGS
}
"
""
CFLAGS
"
${
CMAKE_C_FLAGS
}
${
CMAKE_C_FLAGS_RELWITHDEBINFO
}
"
)
STRING
(
REPLACE
"
${
MY_MAINTAINER_CXX_WARNINGS
}
"
""
CXXFLAGS
"
${
CMAKE_CXX_FLAGS
}
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
"
)
...
...
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