aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kniager <jeremyk@lunarg.com>2019-10-11 09:58:21 -0600
committerjeremyk-lunarg <jeremyk@lunarg.com>2019-10-11 10:51:28 -0600
commitc472b5767594064e1a2cb31e3829f455c663d4eb (patch)
treed42a5086acbeb8b980806c1466a50667fbea7bf2
parentfe71c2d7086f3ba6cc3064dafbf191cee037d3a0 (diff)
downloadusermoji-c472b5767594064e1a2cb31e3829f455c663d4eb.tar.xz
build: Fix Vulkaninfo Bundle build on MacOS
Fixes MacOS crash while building the Vulkaninfo.app bundle. Change-Id: Ic1e3c4cef7de5d9458f4d0fc056093abb352bf1a
-rw-r--r--vulkaninfo/macOS/vulkaninfo.cmake2
1 files changed, 1 insertions, 1 deletions
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")