-
Notifications
You must be signed in to change notification settings - Fork 7.7k
[moltenvk] New Port #14819
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
[moltenvk] New Port #14819
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
9aaa182
initial
Haeri 5d3c3c8
Update portfile.cmake
Haeri dee07d4
format-manifest
Haeri 0d3f387
Update ports/moltenvk/portfile.cmake
Haeri 57955a2
Update ports/moltenvk/portfile.cmake
Haeri 96885ec
[moltenvk] Add dependencies
96deaf5
use xcode-build
c295ca1
Update scripts/ci.baseline.txt
JackBoosY File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,8 @@ | ||
| diff --git a/configure b/configure | ||
| new file mode 100644 | ||
| index 000000000..b87cb74 | ||
| --- /dev/null | ||
| +++ b/configure | ||
| @@ -0,0 +1 @@ | ||
| +# This file needs to exist for vcpkg_configure_make to work | ||
| \ No newline at end of file |
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,57 @@ | ||
| vcpkg_fail_port_install(ON_TARGET "WINDOWS" "LINUX" "UWP") | ||
|
|
||
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO KhronosGroup/MoltenVK | ||
| REF ce85a96d8041b208e6f32898912b217957019b5a | ||
| SHA512 fa77a807a6e17fa7359b13546d46e5c5ebb4b7180df0a6fe378ff407c71c40670417ce135195db452df0d2fd1eaa51e39dda6743a1bbf19a6a68417d5e18e360 | ||
| HEAD_REF master | ||
| PATCHES | ||
| added_configure.patch | ||
| ) | ||
|
|
||
| # TODO: The dependencies are manually pulled by this script. This step should be ommited and dependencies integrated by vcpkg. | ||
| vcpkg_execute_required_process( | ||
| COMMAND ./fetchDependencies --macos | ||
| WORKING_DIRECTORY ${SOURCE_PATH} | ||
| ) | ||
|
|
||
| vcpkg_configure_make( | ||
| SOURCE_PATH ${SOURCE_PATH} | ||
| #SKIP_CONFIGURE this doesn't work. We therefore patch in an empty configure file | ||
| COPY_SOURCE | ||
| PREFER_NINJA | ||
| ) | ||
|
|
||
| # TODO: This actually builds the release build two times. We need to actually build a debug verion | ||
| # TODO: Currently only macos target is built. ios and tv os should be exported as features | ||
| vcpkg_build_make(BUILD_TARGET macos) | ||
|
JackBoosY marked this conversation as resolved.
Outdated
|
||
|
|
||
|
|
||
| # copy copyright | ||
| file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/moltenvk RENAME copyright) | ||
|
|
||
| # copy MoltenVK include | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Package/Latest/MoltenVK/include DESTINATION ${CURRENT_PACKAGES_DIR}) | ||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/vulkan) | ||
|
|
||
| # copy MoltenVKShaderConverter include | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Package/Latest/MoltenVKShaderConverter/include DESTINATION ${CURRENT_PACKAGES_DIR}) | ||
|
|
||
| # copy tools | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Package/Latest/MoltenVKShaderConverter/Tools/MoltenVKShaderConverter DESTINATION ${CURRENT_PACKAGES_DIR}/tools/moltenvk) | ||
|
|
||
|
|
||
| if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") | ||
|
Haeri marked this conversation as resolved.
Outdated
|
||
| # copy release dynamic | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Package/Latest/MoltenVK/dylib/macOS/libMoltenVK.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/bin) | ||
| # copy debug dynamic | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Package/Latest/MoltenVK/dylib/macOS/libMoltenVK.dylib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) | ||
| endif() | ||
|
|
||
| # copy release static | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Package/Latest/MoltenVK/MoltenVK.xcframework/macos-x86_64/libMoltenVK.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib) | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Package/Latest/MoltenVKShaderConverter/MoltenVKShaderConverter.xcframework/macos-x86_64/libMoltenVKShaderConverter.a DESTINATION ${CURRENT_PACKAGES_DIR}/lib) | ||
| # copy debug static | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Package/Latest/MoltenVK/MoltenVK.xcframework/macos-x86_64/libMoltenVK.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) | ||
| file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Package/Latest/MoltenVKShaderConverter/MoltenVKShaderConverter.xcframework/macos-x86_64/libMoltenVKShaderConverter.a DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) | ||
|
Haeri marked this conversation as resolved.
Outdated
|
||
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,10 @@ | ||
| { | ||
| "name": "moltenvk", | ||
| "version-string": "1.1.1", | ||
| "description": "MoltenVK is a Vulkan Portability implementation. It layers a subset of the high-performance, industry-standard Vulkan graphics and compute API over Apple's Metal graphics framework, enabling Vulkan applications to run on iOS and macOS.", | ||
| "homepage": "https://github.com/KhronosGroup/MoltenVK", | ||
| "supports": "osx", | ||
| "dependencies": [ | ||
| "vulkan-headers" | ||
| ] | ||
| } |
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
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.