-
Notifications
You must be signed in to change notification settings - Fork 7.4k
[universal] add new port #49952
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
base: master
Are you sure you want to change the base?
[universal] add new port #49952
Conversation
|
@microsoft-github-policy-service agree |
|
hey i was trying this out, does your impl fully install properly? i had some errors related to lines 4-5 for cmakelists.txt, it couldnt find the files due to the test folder not being exported to the final release folder, did you have any similar issues? |
|
Yep it worked for me. I am unsure about the build fails. I hope someone from the core team can help me out here. |
|
|
||
| vcpkg_cmake_config_fixup( | ||
| PACKAGE_NAME universal | ||
| CONFIG_PATH share/universal |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From the CI (see generated artifacts): The config file is installed to:
-- Installing: D:/p/universal_x64-windows/CMake/universal-config.cmake
Therefore it should be
| CONFIG_PATH share/universal | |
| CONFIG_PATH CMake |
| vcpkg_cmake_install() | ||
|
|
||
| vcpkg_cmake_config_fixup( | ||
| PACKAGE_NAME universal |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As this equal to the port name, this is not necessary.
@BillyONeal I think universal is a really generic library name. Maybe rename this port to stillwater-universal? In this case line would be still necessary.
| vcpkg_from_github( | ||
| OUT_SOURCE_PATH SOURCE_PATH | ||
| REPO stillwater-sc/universal | ||
| REF v3.96 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| REF v3.96 | |
| REF "v${VERSION}" |
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") | ||
|
|
||
| file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") | ||
| vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") No newline at end of file |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you add a line break at end of file (same for the usage file). Looks better in GitHub here ;-)
| ) | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") | ||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove this line, as share is not installed (as this port write the cmake export files to CMake instead).
| CONFIG_PATH share/universal | ||
| ) | ||
|
|
||
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Uppercase, as I see in the CI logs:
-- Installing: D:/p/universal_x64-windows/debug/Include/universal
-- Installing: D:/p/universal_x64-windows/debug/Include/universal/adapters
-- Installing: D:/p/universal_x64-windows/debug/Include/universal/adapters/adapt_integer_and_posit.hpp
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") | |
| file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/Include") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually the headers must go to <prefix>/include for proper vcpkg install layout. Do not assume a case-insensitive file system.
universalon Repology)./vcpkg x-add-version --alland committing the result.Notes:
fix-install-path.patchto resolve an issue where the upstreamCMakeLists.txtattempts to install headers frominclude/universalwhile the source structure isinclude/sw/universal.-DUNIVERSAL_ENABLE_TESTS=OFF) and verbose build output to ensure a clean build.include/universal.