diff --git a/CMakeLists.txt b/CMakeLists.txt
index f55a4198c7..d1409c0c5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -332,17 +332,11 @@ endforeach()
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_UMF_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-if(MSVC)
+if(CMAKE_GENERATOR MATCHES "Visual Studio" OR CMAKE_GENERATOR MATCHES
+                                              "Ninja Multi-Config")
     set(CMAKE_UMF_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/$<CONFIG>)
 endif()
 
-# Define a path for custom commands to work around MSVC
-set(CUSTOM_COMMAND_BINARY_DIR ${CMAKE_UMF_OUTPUT_DIRECTORY})
-if(MSVC)
-    # MSVC implicitly adds $<CONFIG> to the output path
-    set(CUSTOM_COMMAND_BINARY_DIR ${CUSTOM_COMMAND_BINARY_DIR}/$<CONFIG>)
-endif()
-
 # Sanitizer flags
 if(UMF_USE_ASAN)
     add_sanitizer_flag(address)