Skip to content

Commit fb8818c

Browse files
committed
Fix CMakeLists.txt for cmake Ninja generator
1 parent dc64ba2 commit fb8818c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cmake/install_macros.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
312312
MESSAGE(FATAL_ERROR "Need DESTINATION parameter for INSTALL_DEBUG_TARGET")
313313
ENDIF()
314314
GET_TARGET_PROPERTY(target_location ${target} LOCATION)
315-
IF(CMAKE_GENERATOR MATCHES "Makefiles")
315+
IF(CMAKE_GENERATOR MATCHES "Makefiles|Ninja")
316316
STRING(REPLACE "${CMAKE_BINARY_DIR}" "${DEBUGBUILDDIR}" debug_target_location "${target_location}")
317317
ELSE()
318318
STRING(REPLACE "${CMAKE_CFG_INTDIR}" "Debug" debug_target_location "${target_location}" )

cmake/plugin.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ MACRO(MYSQL_ADD_PLUGIN)
108108
# Build either static library or module
109109
IF (WITH_${plugin} AND NOT ARG_MODULE_ONLY)
110110

111-
IF(CMAKE_GENERATOR MATCHES "Makefiles")
111+
IF(CMAKE_GENERATOR MATCHES "Makefiles|Ninja")
112112
# If there is a shared library from previous shared build,
113113
# remove it. This is done just for mysql-test-run.pl
114114
# so it does not try to use stale shared lib as plugin

scripts/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ IF(MALLOC_LIB)
8888
INSTALL(FILES ${MALLOC_LIB} DESTINATION ${INSTALL_LIBDIR} OPTIONAL)
8989
ENDIF()
9090

91-
IF(CMAKE_GENERATOR MATCHES "Makefiles")
91+
IF(CMAKE_GENERATOR MATCHES "Makefiles|Ninja")
9292
# Strip maintainer mode options if necessary
9393
STRING(REPLACE "${MY_MAINTAINER_C_WARNINGS}" "" CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
9494
STRING(REPLACE "${MY_MAINTAINER_CXX_WARNINGS}" "" CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")

0 commit comments

Comments
 (0)