ilusha/pbrt-v4
1
0
Fork 0
mirror of https://github.com/mmp/pbrt-v4 synced 2026-09-26 16:20:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

Merge pull request #516 from gonsolo/noseven

Browse source 
Remove Optix version.
This commit is contained in:
Matt Pharr 2025-10-23 19:27:02 -07:00 • committed by GitHub
commit 935c10f7f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
CMakeLists.txt
View file

@ -22,7 +22,7 @@ option (PBRT_DBG_LOGGING "Enable (very verbose!) debug logging" OFF)
option (PBRT_NVTX "Insert NVTX annotations for NVIDIA Profiling and Debugging Tools" OFF)
option (PBRT_NVML "Use NVML for GPU performance measurement" OFF)
option (PBRT_USE_PREGENERATED_RGB_TO_SPECTRUM_TABLES "Use pregenerated rgbspectrum_*.cpp files rather than running rgb2spec_opt to generate them at build time" OFF)
set (PBRT_OPTIX7_PATH $ENV{PBRT_OPTIX7_PATH} CACHE PATH "Path to OptiX 7 SDK")
set (PBRT_OPTIX_PATH $ENV{PBRT_OPTIX_PATH} CACHE PATH "Path to OptiX SDK")
set (PBRT_GPU_SHADER_MODEL "" CACHE STRING "")
@ -207,8 +207,8 @@ of CUDA installed, please update your PATH.")
message (SEND_ERROR "Unfortunately, pbrt-v4 triggers an internal compiler error in CUDA 11.3.0. Please either use CUDA 11.0-11.2 or 11.3.1 or later.")
endif ()
if ("${PBRT_OPTIX7_PATH}" STREQUAL "")
message (WARNING "Found CUDA but PBRT_OPTIX7_PATH is not set. Disabling GPU compilation.")
if ("${PBRT_OPTIX_PATH}" STREQUAL "")
message (WARNING "Found CUDA but PBRT_OPTIX_PATH is not set. Disabling GPU compilation.")
else ()
enable_language (CUDA)
list (APPEND PBRT_DEFINITIONS "PBRT_BUILD_GPU_RENDERER")
@ -283,7 +283,7 @@ of CUDA installed, please update your PATH.")
set (PBRT_CUDA_LIB cuda)
# optix
# FIXME
include_directories (${PBRT_OPTIX7_PATH}/include)
include_directories (${PBRT_OPTIX_PATH}/include)
# find CUDA's bin2c executable
get_filename_component (cuda_compiler_bin "${CMAKE_CUDA_COMPILER}" DIRECTORY)
@ -881,8 +881,8 @@ target_include_directories (pbrt_lib PUBLIC
${GLAD_INCLUDE}
)
if (PBRT_CUDA_ENABLED AND PBRT_OPTIX7_PATH)
target_include_directories (pbrt_lib SYSTEM PUBLIC ${PBRT_OPTIX7_PATH}/include)
if (PBRT_CUDA_ENABLED AND PBRT_OPTIX_PATH)
target_include_directories (pbrt_lib SYSTEM PUBLIC ${PBRT_OPTIX_PATH}/include)
endif ()
target_compile_options (pbrt_lib PUBLIC ${PBRT_CXX_FLAGS})