From c070ff6e4265e781bf3944bc40b2240a432062bc Mon Sep 17 00:00:00 2001 From: Mike Schuchardt Date: Fri, 20 Dec 2024 13:34:51 -0800 Subject: cube: Don't use MoltenVK include dir on macOS It may contain a different/incompatible vulkan.h/vulkan.hpp than the known good version. --- cube/macOS/cube/CMakeLists.txt | 3 +-- cube/macOS/cubepp/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cube/macOS/cube/CMakeLists.txt b/cube/macOS/cube/CMakeLists.txt index 6ff1a787..3300d6b4 100644 --- a/cube/macOS/cube/CMakeLists.txt +++ b/cube/macOS/cube/CMakeLists.txt @@ -55,8 +55,7 @@ endif() add_dependencies(vkcube MoltenVK_icd-staging-json) # Include demo source code dir because the MacOS cube's Objective-C source includes the "original" cube application C source code. -# Also include the MoltenVK helper files. -target_include_directories(vkcube PRIVATE . ${MOLTENVK_DIR}/MoltenVK/include) +target_include_directories(vkcube PRIVATE ${CMAKE_CURRENT_LIST_DIR}) # We do this so vkcube is linked to an individual library and NOT a framework. target_link_libraries(vkcube Vulkan::Loader "-framework Cocoa -framework QuartzCore") diff --git a/cube/macOS/cubepp/CMakeLists.txt b/cube/macOS/cubepp/CMakeLists.txt index 874dbad9..cf051654 100644 --- a/cube/macOS/cubepp/CMakeLists.txt +++ b/cube/macOS/cubepp/CMakeLists.txt @@ -55,8 +55,8 @@ endif() add_dependencies(vkcubepp MoltenVK_icd-staging-json) # Include demo source code dir because the MacOS vkcubepp's Objective-C source includes the "original" vkcubepp application C++ source -# code. Also include the MoltenVK helper files. -target_include_directories(vkcubepp PRIVATE ${CMAKE_CURRENT_LIST_DIR} ${MOLTENVK_DIR}/MoltenVK/include) +# code. +target_include_directories(vkcubepp PRIVATE ${CMAKE_CURRENT_LIST_DIR}) # We do this so vkcubepp is linked to an individual library and NOT a framework. target_link_libraries(vkcubepp Vulkan::Loader "-framework Cocoa -framework QuartzCore") -- cgit v1.2.3