-
Notifications
You must be signed in to change notification settings - Fork 6.6k
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
[anari] Update to 0.12.0 #43188
base: master
Are you sure you want to change the base?
[anari] Update to 0.12.0 #43188
Conversation
ports/anari/portfile.cmake
Outdated
-DBUILD_EXAMPLES=OFF | ||
-DBUILD_VIEWER=OFF | ||
-DBUILD_CTS=OFF | ||
-DBUILD_EXAMPLES=OFF | ||
-DBUILD_HDANARI=OFF | ||
-DBUILD_HELIDE_DEVICE=OFF | ||
-DBUILD_REMOTE_DEVICE=OFF | ||
-DBUILD_TESTING=OFF | ||
-DBUILD_VIEWER=OFF | ||
-DINSTALL_CODE_GEN_SCRIPTS=ON | ||
-DINSTALL_VIEWER_LIBRARY=ON |
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.
Maybe it is better to keep alphabetical order, to avoid dupliation (as now for BUILD_EXAMPLES)?
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.
Fixed.
ports/anari/portfile.cmake
Outdated
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") | ||
file(REMOVE_RECURSE | ||
"${CURRENT_PACKAGES_DIR}/bin" | ||
"${CURRENT_PACKAGES_DIR}/debug/bin" | ||
file(REMOVE_RECURSE | ||
"${CURRENT_PACKAGES_DIR}/bin" | ||
"${CURRENT_PACKAGES_DIR}/debug/bin" | ||
) | ||
endif() |
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.
It is not introduced by this PR, but ... explicit removal of bin
is often a misguided approach to deal with tools. (Tool must also be handled for shared linkage. The right approach is vcpkg_copy_tools(... AUTO_CLEAN)
.)
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.
I removed the full clause. No tool or alike are installed there with the new version and the updated set of compile flags.
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.
OK, so this one is a bit more involved and not about tools.
ANARI relies on shared libraries for its target devices, so even a static build must have those.
I update the build so that:
- the main anari library can be built as static or shared.
- VCPKG_POLICY_DLLS_IN_STATIC_LIBRARY is set to enabled.
We'll later check upstream how to handle that in a more graceful ways (that is correctly honouring BUILD_SHARED_LIBRARY CMake input). @jeffamstutz for vis.
Nothing gets installed in there with the new set of flags.
@dg0yt Thanks for the fast review. I've been addressing your comments. |
The "supports" clause reflects platforms that may be fixed by this new version.Any fixed CI baseline entries are removed from that file.Any patches that are no longer applied are deleted from the port's directory../vcpkg x-add-version --all
and committing the result.