diff --git a/cmake/install_macros.cmake b/cmake/install_macros.cmake
index ee345b177bd..bd834ece4b0 100644
--- a/cmake/install_macros.cmake
+++ b/cmake/install_macros.cmake
@@ -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}" )
diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake
index 6f3dec4619a..87552fe4d67 100644
--- a/cmake/plugin.cmake
+++ b/cmake/plugin.cmake
@@ -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 
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index e865edc46c0..d3a7861269c 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -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}")