diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
index 92e7cbf1617..745e221f19f 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
@@ -90,8 +90,7 @@ if(WITH_OPENGL_BACKEND)
 endif()
 
 if(WITH_VULKAN_BACKEND)
-
-  if(APPLE)
+  if (WITH_VULKAN_MOLTENVK)
     list(APPEND INC_SYS
       PUBLIC ${MOLTENVK_INCLUDE_DIRS}
     )
@@ -99,6 +98,7 @@ if(WITH_VULKAN_BACKEND)
     list(APPEND LIB
       ${MOLTENVK_LIBRARIES}
     )
+    add_definitions(-DWITH_VULKAN_MOLTENVK)
   endif()
 
   list(APPEND SRC
diff --git a/intern/ghost/intern/GHOST_ContextVK.cc b/intern/ghost/intern/GHOST_ContextVK.cc
index 5ef305a5765..b32ccc301b6 100644
--- a/intern/ghost/intern/GHOST_ContextVK.cc
+++ b/intern/ghost/intern/GHOST_ContextVK.cc
@@ -1054,12 +1054,12 @@ GHOST_TSuccess GHOST_ContextVK::initializeDrawingContext()
   if (vulkan_device->has_extensions({VK_KHR_MAINTENANCE_4_EXTENSION_NAME})) {
     required_device_extensions.push_back(VK_KHR_MAINTENANCE_4_EXTENSION_NAME);
   }
-#ifdef VK_MVK_MOLTENVK_EXTENSION_NAME
+#ifdef WITH_VULKAN_MOLTENVK
   /* According to the Vulkan specs, when `VK_KHR_portability_subset` is available it should be
    * enabled. See
    * https://vulkan.lunarg.com/doc/view/1.2.198.1/mac/1.2-extensions/vkspec.html#VUID-VkDeviceCreateInfo-pProperties-04451*/
   if (vulkan_device->has_extensions({VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME})) {
-    extensions_device.push_back(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME);
+    required_device_extensions.push_back(VK_KHR_PORTABILITY_SUBSET_EXTENSION_NAME);
   }
 #endif
   vulkan_device->ensure_device(required_device_extensions, optional_device_extensions);