rename OptiX7 CMake module to just OptiX

Author: jeffamstutz

CMakeLists.txt

@@ -94,7 +94,6 @@ find_package(anari ${ANARI_REQUIRED_VERSION} REQUIRED)
 
 # CUDA
 find_package(CUDAToolkit 11.3.1)
-find_package(OptiX7)
 
 # OpenGL
 find_package(OpenGL)

cmake/EmbedPTX.cmake

@@ -27,7 +27,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
 
 function(EmbedPTX)
   set(oneArgs OUTPUT_HEADER_FILE INPUT_TARGET)

cmake/FindOptiX7.cmake cmake/FindOptiX.cmake

@@ -27,34 +27,34 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-if (TARGET OptiX7::OptiX7)
+if (TARGET OptiX::OptiX)
   return()
 endif()
 
-macro(OptiX7_config_message)
-  if (NOT DEFINED OptiX7_FIND_QUIETLY)
+macro(OptiX_config_message)
+  if (NOT DEFINED OptiX_FIND_QUIETLY)
     message(${ARGN})
   endif()
 endmacro()
 
-find_path(OptiX7_ROOT_DIR NAMES include/optix.h)
+find_path(OptiX_ROOT_DIR NAMES include/optix.h)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(OptiX7
-  FOUND_VAR OptiX7_FOUND
+find_package_handle_standard_args(OptiX
+  FOUND_VAR OptiX_FOUND
   REQUIRED_VARS
-    OptiX7_ROOT_DIR
+    OptiX_ROOT_DIR
   REASON_FAILURE_MESSAGE
-    "OptiX7 installation not found on CMAKE_PREFIX_PATH (include/optix.h)"
+    "OptiX installation not found on CMAKE_PREFIX_PATH (include/optix.h)"
 )
 
-if (NOT OptiX7_FOUND)
-  set(OptiX7_NOT_FOUND_MESSAGE "Unable to find OptiX7, please add your OptiX7 installation to CMAKE_PREFIX_PATH")
+if (NOT OptiX_FOUND)
+  set(OptiX_NOT_FOUND_MESSAGE "Unable to find OptiX, please add your OptiX installation to CMAKE_PREFIX_PATH")
   return()
 endif()
 
-set(OptiX7_INCLUDE_DIR ${OptiX7_ROOT_DIR}/include)
-set(OptiX7_INCLUDE_DIRS ${OptiX7_INCLUDE_DIR})
+set(OptiX_INCLUDE_DIR ${OptiX_ROOT_DIR}/include)
+set(OptiX_INCLUDE_DIRS ${OptiX_INCLUDE_DIR})
 
-add_library(OptiX7::OptiX7 INTERFACE IMPORTED)
-target_include_directories(OptiX7::OptiX7 INTERFACE ${OptiX7_INCLUDE_DIR})
+add_library(OptiX::OptiX INTERFACE IMPORTED)
+target_include_directories(OptiX::OptiX INTERFACE ${OptiX_INCLUDE_DIR})

devices/rtx/CMakeLists.txt

@@ -52,7 +52,7 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN TRUE)
 ## Find dependencies ##
 
 find_package(CUDAToolkit 11.3.1 REQUIRED)
-find_package(OptiX7 REQUIRED)
+find_package(OptiX REQUIRED)
 if(VISRTX_ENABLE_MDL_SUPPORT)
   find_package(MDL_SDK REQUIRED)
 endif()
@@ -182,7 +182,7 @@ PUBLIC
 PRIVATE
   anari::helium
   glm_visrtx
-  OptiX7::OptiX7
+  OptiX::OptiX
   CUDA::cuda_driver
   CUDA::curand
   fmt::fmt
@@ -238,7 +238,7 @@ function(GenerateEmbeddedPTX DIR BASE_NAME)
     anari::anari
     anari::helium
     glm_visrtx
-    OptiX7::OptiX7
+    OptiX::OptiX
     CUDA::curand
     libnanovdb
   )