diff --git a/CMakePresets.json b/CMakePresets.json index 07059891f..21afe39d7 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -30,18 +30,26 @@ "CMAKE_SYSTEM_NAME": "Darwin", "CMAKE_CXX_COMPILER_LAUNCHER": "ccache", "CMAKE_OSX_DEPLOYMENT_TARGET": "14.3", - "MLN_WITH_METAL": "ON", - "MLN_WITH_OPENGL": "OFF", "CMAKE_BUILD_TYPE": "Debug", "MLN_DARWIN_USE_LIBUV": "ON" } }, { - "name": "macos-xcode", + "name": "macos-metal", + "displayName": "macOS Metal", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-macos-metal", + "inherits": "macos", + "cacheVariables": { + "MLN_WITH_METAL": "ON" + } + }, + { + "name": "macos-metal-xcode", "displayName": "macOS (Xcode)", "generator": "Xcode", - "binaryDir": "${sourceDir}/build-macos-xcode", - "inherits": "macos" + "binaryDir": "${sourceDir}/build-macos-metal-xcode", + "inherits": "macos-metal" }, { "name": "macos-vulkan", @@ -50,9 +58,7 @@ "binaryDir": "${sourceDir}/build-macos-vulkan", "inherits": "macos", "cacheVariables": { - "MLN_WITH_VULKAN": "ON", - "MLN_WITH_METAL": "OFF", - "MLN_WITH_OPENGL": "OFF" + "MLN_WITH_VULKAN": "ON" } }, { @@ -64,7 +70,7 @@ }, { "name": "macos-metal-node", - "inherits": "macos", + "inherits": "macos-metal", "binaryDir": "${sourceDir}/build", "displayName": "MacOS Node", "description": "MacOS Node build (Metal renderer)", @@ -82,8 +88,6 @@ "binaryDir": "${sourceDir}/build-macos-webgpu-dawn", "inherits": "macos", "cacheVariables": { - "MLN_WITH_METAL": "OFF", - "MLN_WITH_OPENGL": "OFF", "MLN_WITH_WEBGPU": "ON", "MLN_WEBGPU_IMPL": "dawn", "MLN_DARWIN_USE_LIBUV": "ON" @@ -96,8 +100,6 @@ "binaryDir": "${sourceDir}/build-macos-webgpu-wgpu", "inherits": "macos", "cacheVariables": { - "MLN_WITH_METAL": "OFF", - "MLN_WITH_OPENGL": "OFF", "MLN_WITH_WEBGPU": "ON", "MLN_WEBGPU_IMPL": "wgpu", "MLN_DARWIN_USE_LIBUV": "ON" diff --git a/docs/mdbook/src/platforms/macos/README.md b/docs/mdbook/src/platforms/macos/README.md index 68aae63cd..2766e78df 100644 --- a/docs/mdbook/src/platforms/macos/README.md +++ b/docs/mdbook/src/platforms/macos/README.md @@ -79,8 +79,8 @@ build-macos/mbgl-test-runner Create and open an Xcode project with CMake: ```sh -cmake --preset macos-xcode -xed build-macos-xcode/MapLibre\ Native.xcodeproj +cmake --preset macos-metal-xcode +xed build-macos-metal-xcode/MapLibre\ Native.xcodeproj ``` Configure project for Vulkan (make sure [MoltenVK](https://github.com/KhronosGroup/MoltenVK) is installed):