WIP: CMake only PR. #1947
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| cmake_minimum_required(VERSION 3.25) | ||
| project(MoltenVK) | ||
|
|
||
| set(MVK_GIT_REV "unknown") | ||
|
|
||
| find_package(Git) | ||
| if(GIT_FOUND) | ||
| execute_process( | ||
| COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD | ||
| OUTPUT_VARIABLE MVK_GIT_REV | ||
| ERROR_QUIET | ||
| OUTPUT_STRIP_TRAILING_WHITESPACE | ||
| ) | ||
| message( STATUS "GIT hash: ${MVK_GIT_REV}") | ||
| else() | ||
| message(STATUS "GIT not found") | ||
| endif() | ||
|
|
||
| configure_file(${CMAKE_CURRENT_LIST_DIR}/mvkGitRevDerived.h.in | ||
| ${CMAKE_CURRENT_BINARY_DIR}/mvkGitRevDerived.h) | ||
|
|
||
| add_subdirectory(External) | ||
| add_subdirectory(MoltenVKShaderConverter) | ||
| add_subdirectory(MoltenVK) | ||
|
|
||
| target_include_directories(MoltenVK-iOS PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) | ||
| target_include_directories(MoltenVK-tvOS PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) | ||
| target_include_directories(MoltenVK-macOS PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| set(SKIP_PORTABILITY_TEST ON) | ||
| set(JUST_INSTALL_CEREAL ON) | ||
|
|
||
| add_subdirectory(cereal) | ||
| add_subdirectory(glslang) | ||
| set(SPIRV_TOOLS_BUILD_STATIC ON) | ||
| add_subdirectory(SPIRV-Cross) | ||
| add_subdirectory(Vulkan-Headers) | ||
billhollings marked this conversation as resolved.
Show resolved
Hide resolved
Contributor
There was a problem hiding this comment. The contents of There was a problem hiding this comment. In regards to external deps, for a cmake approach, was CPM considered? |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,204 @@ | ||||||
|
|
||||||
|
|
||||||
| ## | ||||||
| ## MoltenVK-iOS Files | ||||||
| ## | ||||||
|
|
||||||
| set(MOLTEN_VK_PROJECT_HEADERS | ||||||
gpx1000 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||||||
| ${CMAKE_CURRENT_LIST_DIR}/../Common/MVKCommonEnvironment.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/../Common/MVKOSExtensions.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/../Common/MVKStrings.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API/mvk_datatypes.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API/mvk_vulkan.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/API/vk_mvk_moltenvk.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdDebug.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdDraw.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdPipeline.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdQueries.h | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdRenderPass.h | ||||||
|
||||||
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdRenderPass.h | |
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdRendering.h |
Outdated
Contributor
There was a problem hiding this comment.
Suggested change
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdRenderPass.mm | |
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/Commands/MVKCmdRendering.mm |
Outdated
Contributor
There was a problem hiding this comment.
Suggested change
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/CAMetalLayer+MoltenVK.m | |
| ${CMAKE_CURRENT_LIST_DIR}/MoltenVK/OS/CAMetalLayer+MoltenVK.mm |
gpx1000 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
gpx1000 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
Outdated
Contributor
There was a problem hiding this comment.
The MoltenVK-iOS target builds a macOS binary.
gpx1000 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
gpx1000 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
Outdated
Contributor
There was a problem hiding this comment.
The MoltenVK-tvOS target builds a macOS binary.
Outdated
Contributor
There was a problem hiding this comment.
The MoltenVK-macOS target builds the MoltenVKShaderConverter tool, not a MoltenVK static library.
Outdated
Contributor
There was a problem hiding this comment.
To get any of the MoltenVK-* targets to build, I also had to add the following build settings:
CURRENT_PROJECT_VERSION=1.2.9
GCC_PREPROCESSOR_DEFINITIONS=MVK_FRAMEWORK_VERSION=${CURRENT_PROJECT_VERSION}
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| ## | ||
| ## MoltenVKShaderConverter Files | ||
| ## | ||
|
|
||
| add_library(moltenvk_shader_converter STATIC | ||
| ../Common/MVKOSExtensions.mm | ||
| MoltenVKShaderConverter/SPIRVSupport.cpp | ||
| MoltenVKShaderConverterTool/MoltenVKShaderConverterTool.cpp | ||
| MoltenVKShaderConverterTool/OSSupport.mm | ||
| MoltenVKShaderConverterTool/main.cpp | ||
| MoltenVKShaderConverter/FileSupport.mm | ||
| MoltenVKShaderConverter/GLSLConversion.mm | ||
| MoltenVKShaderConverter/GLSLToSPIRVConverter.cpp | ||
| MoltenVKShaderConverter/SPIRVConversion.mm | ||
| MoltenVKShaderConverter/SPIRVToMSLConverter.cpp | ||
| ) | ||
billhollings marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| find_library(FOUNDATION_LIBRARY Foundation) | ||
| message(STATUS "FOUNDATION_LIBRARY is ${FOUNDATION_LIBRARY}") | ||
gpx1000 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| find_library(METAL_LIBRARY Metal) | ||
| message(STATUS "METAL_LIBRARY is ${METAL_LIBRARY}") | ||
| find_library(APPKIT_LIBRARY AppKit) | ||
| message(STATUS "APPKIT_LIBRARY is ${APPKIT_LIBRARY}") | ||
| find_library(IOKIT_LIBRARY IOKit) | ||
| message(STATUS "IOKIT_LIBRARY is ${IOKIT_LIBRARY}") | ||
| find_library(IOSURFACE_LIBRARY IOSurface) | ||
| message(STATUS "IOSURFACE_LIBRARY is ${IOSURFACE_LIBRARY}") | ||
| find_library(QUARTZCORE_LIBRARY QuartzCore) | ||
| message(STATUS "QUARTZCORE_LIBRARY is ${QUARTZCORE_LIBRARY}") | ||
|
|
||
|
|
||
| target_link_libraries(moltenvk_shader_converter PUBLIC ${FOUNDATION_LIBRARY} ${METAL_LIBRARY} ${APPKIT_LIBRARY} | ||
| ${IOKIT_LIBRARY} ${IOSURFACE_LIBRARY} ${QUARTZCORE_LIBRARY} | ||
| cereal spirv-cross-msl glslang SPIRV-Tools-opt spirv-cross-reflect SPIRV) | ||
|
|
||
| target_include_directories(moltenvk_shader_converter PUBLIC MoltenVKShaderConverter include | ||
| ${CMAKE_CURRENT_LIST_DIR}/../Common | ||
| ${CMAKE_CURRENT_LIST_DIR}/../External | ||
| ${CMAKE_CURRENT_LIST_DIR}) | ||
| target_compile_features(moltenvk_shader_converter PUBLIC cxx_std_17) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| // Auto-generated by MoltenVK | ||
| static const char* mvkRevString = "@MVK_GIT_REV@"; | ||
|
Contributor
There was a problem hiding this comment. I'd like to avoid cluttering the top level directory if possible. Can we find a different home for this file? Maybe under
Contributor
There was a problem hiding this comment. This file should be moved to a new |
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.