Skip to content

Commit 2c5fe05

Browse files
committed
build: Simplify FindOptiX.cmake a big now that OptiX 7 is the minimum
Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 452e846 commit 2c5fe05

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

src/cmake/modules/FindOptiX.cmake

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,6 @@ if (OPTIX_INCLUDE_DIR)
6464
set(OPTIX_VERSION "${OPTIX_VERSION_MAJOR}.${OPTIX_VERSION_MINOR}.${OPTIX_VERSION_MICRO}")
6565
endif ()
6666

67-
# OptiX 7 doesn't link to any libraries
68-
if (OPTIX_VERSION VERSION_LESS 7)
69-
OPTIX_find_api_library(optix ${OPTIX_VERSION})
70-
OPTIX_find_api_library(optixu ${OPTIX_VERSION})
71-
OPTIX_find_api_library(optix_prime ${OPTIX_VERSION})
72-
set (OPTIX_LIBRARIES ${optix_LIBRARY})
73-
endif ()
74-
7567
mark_as_advanced (
7668
OPTIX_INCLUDE_DIR
7769
OPTIX_LIBRARIES
@@ -81,19 +73,11 @@ mark_as_advanced (
8173
include (FindPackageHandleStandardArgs)
8274

8375

84-
if (${OPTIX_VERSION_MAJOR} LESS 7)
85-
find_package_handle_standard_args (OptiX
86-
FOUND_VAR OPTIX_FOUND
87-
REQUIRED_VARS OPTIX_INCLUDE_DIR OPTIX_LIBRARIES OPTIX_VERSION
88-
VERSION_VAR OPTIX_VERSION
89-
)
90-
else ()
91-
find_package_handle_standard_args (OptiX
92-
FOUND_VAR OPTIX_FOUND
93-
REQUIRED_VARS OPTIX_INCLUDE_DIR OPTIX_VERSION
94-
VERSION_VAR OPTIX_VERSION
95-
)
96-
endif()
76+
find_package_handle_standard_args (OptiX
77+
FOUND_VAR OPTIX_FOUND
78+
REQUIRED_VARS OPTIX_INCLUDE_DIR OPTIX_VERSION
79+
VERSION_VAR OPTIX_VERSION
80+
)
9781

9882
if (OPTIX_FOUND)
9983
set (OPTIX_INCLUDES ${OPTIX_INCLUDE_DIR})

0 commit comments

Comments
 (0)