Skip to content

More fixes for install target #9

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

Merged
iwald-nvidia merged 5 commits into from
Dec 17, 2025
+9 −3
Merged

More fixes for install target #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
210958d
- added CUDAToolKit dependecy to install target conf
ingowald Dec 16, 2025
adff969
Merge branch 'NVIDIA:main' into main
ingowald Dec 16, 2025
670eaca
Merge branch 'main' of github.com:NVIDIA/owl
ingowald Dec 17, 2025
3f9a225
Merge branch 'main' of github.com:ingowald/owl
ingowald Dec 17, 2025
a1ecde6
fix cudaConfig.cmake
ingowald Dec 17, 2025
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
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,12 @@ install(EXPORT owl-config
)

install(
# DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/owl
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/owl
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
)
install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/3rdParty/optix/include
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/owl/optix
)


2 changes: 2 additions & 0 deletions owl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,11 @@ target_include_directories(owl-config
)
target_include_directories(owl PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/owl/optix/include>
)
target_include_directories(owl_static PUBLIC
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/owl/optix/include>
)
if (WIN32)
target_compile_definitions(owl-config INTERFACE -DNOMINMAX)
Expand Down
1 change: 0 additions & 1 deletion owl/cmake/embed_ptx.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ function(embed_ptx)

target_sources(${PTX_TARGET} PUBLIC ${EMBED_PTX_SOURCES})

set(CUDA_TOOLKIT_VERSION "13.0.0")
target_link_libraries(${PTX_TARGET} PRIVATE ${EMBED_PTX_PTX_LINK_LIBRARIES})
set_property(TARGET ${PTX_TARGET} PROPERTY CUDA_PTX_COMPILATION ON)
set_property(TARGET ${PTX_TARGET} PROPERTY CUDA_ARCHITECTURES OFF)
Expand Down
4 changes: 3 additions & 1 deletion owl/cmake/owlConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ set(OWL_DATAROOTDIR
${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_DATAROOTDIR@/owl
)

if (@OWL_HAVE_TBB@ AND @TBB_FOUND@)
if (@OWL_HAVE_TBB@)
find_dependency(TBB)
set(OWL_HAVE_TBB ON)
endif()

find_dependency(CUDAToolkit)


foreach(component ${owl_FIND_COMPONENTS})
Expand Down