File tree Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Expand file tree Collapse file tree 3 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -312,7 +312,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
312
312
MESSAGE (FATAL_ERROR "Need DESTINATION parameter for INSTALL_DEBUG_TARGET" )
313
313
ENDIF ()
314
314
GET_TARGET_PROPERTY (target_location ${target} LOCATION )
315
- IF (CMAKE_GENERATOR MATCHES "Makefiles" )
315
+ IF (CMAKE_GENERATOR MATCHES "Makefiles|Ninja " )
316
316
STRING (REPLACE "${CMAKE_BINARY_DIR} " "${DEBUGBUILDDIR} " debug_target_location "${target_location} " )
317
317
ELSE ()
318
318
STRING (REPLACE "${CMAKE_CFG_INTDIR} " "Debug" debug_target_location "${target_location} " )
Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ MACRO(MYSQL_ADD_PLUGIN)
108
108
# Build either static library or module
109
109
IF (WITH_${plugin} AND NOT ARG_MODULE_ONLY )
110
110
111
- IF (CMAKE_GENERATOR MATCHES "Makefiles" )
111
+ IF (CMAKE_GENERATOR MATCHES "Makefiles|Ninja " )
112
112
# If there is a shared library from previous shared build,
113
113
# remove it. This is done just for mysql-test-run.pl
114
114
# so it does not try to use stale shared lib as plugin
Original file line number Diff line number Diff line change @@ -88,7 +88,7 @@ IF(MALLOC_LIB)
88
88
INSTALL (FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL )
89
89
ENDIF ()
90
90
91
- IF (CMAKE_GENERATOR MATCHES "Makefiles" )
91
+ IF (CMAKE_GENERATOR MATCHES "Makefiles|Ninja " )
92
92
# Strip maintainer mode options if necessary
93
93
STRING (REPLACE "${MY_MAINTAINER_C_WARNINGS} " "" CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO} " )
94
94
STRING (REPLACE "${MY_MAINTAINER_CXX_WARNINGS} " "" CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} " )
You can’t perform that action at this time.
0 commit comments