Skip to content
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.

Sign up for GitHub

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

Revert "Temporarily remove nvrtc and nvrtc-builtins from install" #476

Merged
merged 1 commit into from
Oct 3, 2023
Merged

Revert "Temporarily remove nvrtc and nvrtc-builtins from install" #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,22 @@ install(
COMPONENT library
EXCLUDE_FROM_ALL)

# Nothing links against nvrtc-builtins but if we don't include it we get a runtime crash.
# Unfortunately this means we have to bypass CMake's dependency system and install it manually here.
if(WIN32)
install(
FILES "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/bin/nvrtc-builtins64_118.dll"
DESTINATION "${KIT_EXTENSION_BIN_PATH}"
COMPONENT install)
else()
install(
FILES "${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so"
"${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so.11.8"
"${PROJECT_SOURCE_DIR}/extern/nvidia/_build/target-deps/cuda/cuda/lib64/libnvrtc-builtins.so.11.8.89"
DESTINATION "${KIT_EXTENSION_BIN_PATH}"
COMPONENT install)
endif()

install(
TARGETS CesiumOmniversePythonBindings
ARCHIVE DESTINATION ${KIT_EXTENSION_BINDINGS_PATH} COMPONENT install
Expand Down
6 changes: 6 additions & 0 deletions exts/cesium.omniverse/config/extension.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ archiveDirs = ["vendor"]
[[native.plugin]]
path = "bin/cesium.omniverse.plugin"

[[native.library]]
"filter:platform"."windows-x86_64"."path" = "bin/${lib_prefix}nvrtc-builtins64_118${lib_ext}"

[[native.library]]
"filter:platform"."linux-x86_64"."path" = "bin/${lib_prefix}nvrtc-builtins${lib_ext}"

[settings]
exts."cesium.omniverse".defaultAccessToken = ""
persistent.exts."cesium.omniverse".userAccessToken = ""
Expand Down
1 change: 1 addition & 0 deletions src/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ setup_lib(
omni_kit
omni_ui
cuda
nvrtc
pybind11
python310
ADDITIONAL_LIBRARIES
Expand Down