From ca8d349beed75d8fa6d27884cce4f091b6dc2a1e Mon Sep 17 00:00:00 2001 From: Tony-LunarG Date: Wed, 31 Oct 2018 16:10:48 -0600 Subject: Rename cube and cubepp exes to vkcube and vkcubepp Change-Id: Iaecb0e7e21a086c8523b8cd4bc9eccd05e1cbca0 --- cube/macOS/cube/Info.plist | 6 +++--- cube/macOS/cube/cube.cmake | 24 ++++++++++++------------ cube/macOS/cubepp/Info.plist | 4 ++-- cube/macOS/cubepp/cubepp.cmake | 26 +++++++++++++------------- 4 files changed, 30 insertions(+), 30 deletions(-) (limited to 'cube/macOS') diff --git a/cube/macOS/cube/Info.plist b/cube/macOS/cube/Info.plist index b7869d6e..5bad4454 100644 --- a/cube/macOS/cube/Info.plist +++ b/cube/macOS/cube/Info.plist @@ -7,17 +7,17 @@ CFBundleExecutable ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleGetInfoString - Cube + VkCube CFBundleIconFile LunarGIcon.icns CFBundleIdentifier - com.lunarg.cube + com.lunarg.vkcube CFBundleInfoDictionaryVersion 6.0 CFBundleLongVersionString 1.0 CFBundleName - Cube + VkCube CFBundlePackageType APPL CFBundleShortVersionString diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake index b2b6ba53..5b1e228e 100644 --- a/cube/macOS/cube/cube.cmake +++ b/cube/macOS/cube/cube.cmake @@ -15,7 +15,7 @@ # limitations under the License. # ~~~ -# Cube Application Bundle +# VkCube Application Bundle set(cube_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/main.m @@ -32,32 +32,32 @@ if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") set(cube_RESOURCES ${cube_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Resources/Main.storyboard) endif() -add_executable(cube MACOSX_BUNDLE ${cube_SRCS} ${cube_HDRS} ${cube_RESOURCES} cube.vert.inc cube.frag.inc) +add_executable(vkcube MACOSX_BUNDLE ${cube_SRCS} ${cube_HDRS} ${cube_RESOURCES} cube.vert.inc cube.frag.inc) # Handle the Storyboard ourselves if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*") # Compile the storyboard file with the ibtool. - add_custom_command(TARGET cube POST_BUILD + add_custom_command(TARGET vkcube POST_BUILD COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text - --compile ${CMAKE_CURRENT_BINARY_DIR}/cube.app/Contents/Resources/Main.storyboardc + --compile ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Resources/Main.storyboardc ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Resources/Main.storyboard COMMENT "Compiling storyboard") endif() -add_dependencies(cube MoltenVK_icd-staging-json) +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(cube PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include) +target_include_directories(vkcube PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include) # We do this so vulkaninfo is linked to an individual library and NOT a framework. -target_link_libraries(cube ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore") +target_link_libraries(vkcube ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore") -set_target_properties(cube PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Info.plist) +set_target_properties(vkcube PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cube/Info.plist) # The RESOURCE target property cannot be used in conjunction with the MACOSX_PACKAGE_LOCATION property. We need fine-grained # control over the Resource directory, so we have to specify the destination of all the resource files on a per-destination- @@ -71,13 +71,13 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" # Copy the MoltenVK lib into the bundle. if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") - add_custom_command(TARGET cube POST_BUILD + add_custom_command(TARGET vkcube POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/$/cube.app/Contents/Frameworks/libMoltenVK.dylib + ${CMAKE_CURRENT_BINARY_DIR}/$/vkcube.app/Contents/Frameworks/libMoltenVK.dylib DEPENDS vulkan) else() - add_custom_command(TARGET cube POST_BUILD + add_custom_command(TARGET vkcube POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/cube.app/Contents/Frameworks/libMoltenVK.dylib + ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks/libMoltenVK.dylib DEPENDS vulkan) endif() diff --git a/cube/macOS/cubepp/Info.plist b/cube/macOS/cubepp/Info.plist index e8a276ce..0f1c5452 100644 --- a/cube/macOS/cubepp/Info.plist +++ b/cube/macOS/cubepp/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${MACOSX_BUNDLE_EXECUTABLE_NAME} CFBundleGetInfoString - Cubepp + VkCubepp CFBundleIconFile LunarGIcon.icns CFBundleIdentifier @@ -17,7 +17,7 @@ CFBundleLongVersionString 1.0 CFBundleName - Cubepp + VkCubepp CFBundlePackageType APPL CFBundleShortVersionString diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake index 2b523a98..3d95d802 100644 --- a/cube/macOS/cubepp/cubepp.cmake +++ b/cube/macOS/cubepp/cubepp.cmake @@ -15,7 +15,7 @@ # limitations under the License. # ~~~ -# Cube Application Bundle +# VkCube Application Bundle set(cubepp_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/main.mm @@ -34,32 +34,32 @@ if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") set(cubepp_RESOURCES ${cubepp_RESOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/Main.storyboard) endif() -add_executable(cubepp MACOSX_BUNDLE ${cubepp_SRCS} ${cubepp_HDRS} ${cubepp_RESOURCES} cube.vert.inc cube.frag.inc) +add_executable(vkcubepp MACOSX_BUNDLE ${cubepp_SRCS} ${cubepp_HDRS} ${cubepp_RESOURCES} cube.vert.inc cube.frag.inc) # Handle the Storyboard ourselves if(NOT ${CMAKE_GENERATOR} MATCHES "^Xcode.*") # Compile the storyboard file with the ibtool. - add_custom_command(TARGET cubepp POST_BUILD + add_custom_command(TARGET vkcubepp POST_BUILD COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text - --compile ${CMAKE_CURRENT_BINARY_DIR}/cubepp.app/Contents/Resources/Main.storyboardc + --compile ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Resources/Main.storyboardc ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Resources/Main.storyboard COMMENT "Compiling storyboard") endif() -add_dependencies(cubepp MoltenVK_icd-staging-json) +add_dependencies(vkcubepp MoltenVK_icd-staging-json) -# Include demo source code dir because the MacOS cubepp's Objective-C source includes the "original" cubepp application C++ source +# 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(cubepp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include) +target_include_directories(vkcubepp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOLTENVK_DIR}/MoltenVK/include) # We do this so vulkaninfo is linked to an individual library and NOT a framework. -target_link_libraries(cubepp ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore") +target_link_libraries(vkcubepp ${Vulkan_LIBRARY} "-framework Cocoa -framework QuartzCore") -set_target_properties(cubepp PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Info.plist) +set_target_properties(vkcubepp PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/macOS/cubepp/Info.plist) # The RESOURCE target property cannot be used in conjunction with the MACOSX_PACKAGE_LOCATION property. We need fine-grained # control over the Resource directory, so we have to specify the destination of all the resource files on a per-destination- @@ -73,13 +73,13 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json" # Copy the MoltenVK lib into the bundle. if(${CMAKE_GENERATOR} MATCHES "^Xcode.*") - add_custom_command(TARGET cubepp POST_BUILD + add_custom_command(TARGET vkcubepp POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/$/cubepp.app/Contents/Frameworks/libMoltenVK.dylib + ${CMAKE_CURRENT_BINARY_DIR}/$/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib DEPENDS vulkan) else() - add_custom_command(TARGET cubepp POST_BUILD + add_custom_command(TARGET vkcubepp POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/macOS/libMoltenVK.dylib" - ${CMAKE_CURRENT_BINARY_DIR}/cubepp.app/Contents/Frameworks/libMoltenVK.dylib + ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib DEPENDS vulkan) endif() -- cgit v1.2.3