Skip to content

Commit

Permalink
Avoid error from install command.
Browse files Browse the repository at this point in the history
Don't add vulkan directory to RESOURCE property.
  • Loading branch information
MarkCallow committed Aug 3, 2024
1 parent c827fba commit cc0f252
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions tests/loadtests/vkloadtests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,15 @@ list( TRANSFORM VK_TEST_IMAGES
)

set( KTX_RESOURCES ${LOAD_TEST_COMMON_RESOURCE_FILES} ${VK_TEST_IMAGES} )
if(IOS)
list( APPEND KTX_RESOURCES ${Vulkan_SHARE_VULKAN} )
if(APPLE)
# Adding this directory to KTX_RESOURCES and ultimately vkloadtests's
# RESOURCE property causes the install command (later in this file) to
# raise an error at configuration time: "RESOURCE given directory". Use
# this instead to cause the files to be added to Resources in the bundle.
set_source_files_properties( ${Vulkan_SHARE_VULKAN}
PROPERTIES
MACOSX_PACKAGE_LOCATION Resources
)
endif()

add_executable( vkloadtests
Expand Down Expand Up @@ -261,6 +268,7 @@ if(APPLE)
# generators. Since configure_file() is happening use the standard
# property names for consistency with the standard Info.plist template.
set_target_properties( vkloadtests PROPERTIES
MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_BUNDLE_NAME ${product_name}
MACOSX_BUNDLE_EXECUTABLE_NAME ${product_name}
MACOSX_BUNDLE_COPYRIGHT "© 2024 Khronos Group, Inc."
Expand Down Expand Up @@ -332,7 +340,7 @@ if(APPLE)
# Specify destination for cmake --install.
install(TARGETS vkloadtests
BUNDLE
DESTINATION /Applications
DESTINATION ${CMAKE_INSTALL_PREFIX}/Applications
COMPONENT VkLoadTestApp
)

Expand Down

0 comments on commit cc0f252

Please sign in to comment.