diff options
| author | Mike Schuchardt <mikes@lunarg.com> | 2024-12-20 13:34:51 -0800 |
|---|---|---|
| committer | Mike Schuchardt <mikes@lunarg.com> | 2024-12-20 14:02:54 -0800 |
| commit | c070ff6e4265e781bf3944bc40b2240a432062bc (patch) | |
| tree | f238e8ebdb4bf9936e730e2e23c0f41b4600a3f4 | |
| parent | 2744de9936755fea6912d47e7a0a8857d8a4fdee (diff) | |
| download | usermoji-c070ff6e4265e781bf3944bc40b2240a432062bc.tar.xz | |
cube: Don't use MoltenVK include dir on macOS
It may contain a different/incompatible vulkan.h/vulkan.hpp than the
known good version.
| -rw-r--r-- | cube/macOS/cube/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | 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") |