From c472b5767594064e1a2cb31e3829f455c663d4eb Mon Sep 17 00:00:00 2001 From: Jeremy Kniager Date: Fri, 11 Oct 2019 09:58:21 -0600 Subject: build: Fix Vulkaninfo Bundle build on MacOS Fixes MacOS crash while building the Vulkaninfo.app bundle. Change-Id: Ic1e3c4cef7de5d9458f4d0fc056093abb352bf1a --- vulkaninfo/macOS/vulkaninfo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vulkaninfo/macOS/vulkaninfo.cmake b/vulkaninfo/macOS/vulkaninfo.cmake index 7ce19612..7625384f 100644 --- a/vulkaninfo/macOS/vulkaninfo.cmake +++ b/vulkaninfo/macOS/vulkaninfo.cmake @@ -35,7 +35,7 @@ set_target_properties(vulkaninfo-bundle ${CMAKE_CURRENT_SOURCE_DIR}/macOS/Info.plist) # We do this so vulkaninfo is linked to an individual library and NOT a framework. target_link_libraries(vulkaninfo-bundle ${Vulkan_LIBRARY} "-framework AppKit -framework QuartzCore") -target_include_directories(vulkaninfo-bundle PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo ${CMAKE_BINARY_DIR}/vulkaninfo ${VulkanHeaders_INCLUDE_DIR}) +target_include_directories(vulkaninfo-bundle PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo ${CMAKE_CURRENT_SOURCE_DIR}/generated ${CMAKE_BINARY_DIR}/vulkaninfo ${VulkanHeaders_INCLUDE_DIR}) add_dependencies(vulkaninfo-bundle MoltenVK_icd-staging-json) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/macOS/vulkaninfo.sh PROPERTIES MACOSX_PACKAGE_LOCATION "MacOS") -- cgit v1.2.3