From d288e3a6ecc6ce15a1dfa807d11f7819f690211c Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 1 Sep 2025 14:02:39 +0300 Subject: [PATCH] Don't need to do `enable_language(CUDA)` --- cmake/FindDependencies.cmake | 41 ++++-------------------------------- 1 file changed, 4 insertions(+), 37 deletions(-) diff --git a/cmake/FindDependencies.cmake b/cmake/FindDependencies.cmake index a38b6276..822762fb 100644 --- a/cmake/FindDependencies.cmake +++ b/cmake/FindDependencies.cmake @@ -71,44 +71,11 @@ message(STATUS "Configuring COLMAP... done") set(CUDA_MIN_VERSION "7.0") if(CUDA_ENABLED) - if(CMAKE_VERSION VERSION_LESS 3.17) - find_package(CUDA QUIET) - if(CUDA_FOUND) - message(STATUS "Found CUDA version ${CUDA_VERSION} installed in " - "${CUDA_TOOLKIT_ROOT_DIR} via legacy CMake (<3.17) module. " - "Using the legacy CMake module means that any installation of " - "COLMAP will require that the CUDA libraries are " - "available under LD_LIBRARY_PATH.") - message(STATUS "Found CUDA ") - message(STATUS " Includes : ${CUDA_INCLUDE_DIRS}") - message(STATUS " Libraries : ${CUDA_LIBRARIES}") - - enable_language(CUDA) - - macro(declare_imported_cuda_target module) - add_library(CUDA::${module} INTERFACE IMPORTED) - target_include_directories( - CUDA::${module} INTERFACE ${CUDA_INCLUDE_DIRS}) - target_link_libraries( - CUDA::${module} INTERFACE ${CUDA_${module}_LIBRARY} ${ARGN}) - endmacro() - - declare_imported_cuda_target(cudart ${CUDA_LIBRARIES}) - declare_imported_cuda_target(curand ${CUDA_LIBRARIES}) - - set(CUDAToolkit_VERSION "${CUDA_VERSION_STRING}") - set(CUDAToolkit_BIN_DIR "${CUDA_TOOLKIT_ROOT_DIR}/bin") - else() - message(STATUS "CUDA not found") - endif() + find_package(CUDAToolkit QUIET) + if(CUDAToolkit_FOUND) + set(CUDA_FOUND ON) else() - find_package(CUDAToolkit QUIET) - if(CUDAToolkit_FOUND) - set(CUDA_FOUND ON) - enable_language(CUDA) - else() - message(STATUS "CUDA not found") - endif() + message(STATUS "CUDA not found") endif() endif()