From 5361a3d9410cb0d8b37970a666c9a75cf2eef2ed Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 2 Feb 2022 05:01:58 -0600 Subject: [PATCH] CMake: Clean up FindCUDA.cmake --- cmake/modules/FindADOLC.cmake | 4 ++-- cmake/modules/FindCUDA.cmake | 9 +++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/cmake/modules/FindADOLC.cmake b/cmake/modules/FindADOLC.cmake index bcba6ffd2a..8301e437cb 100644 --- a/cmake/modules/FindADOLC.cmake +++ b/cmake/modules/FindADOLC.cmake @@ -111,10 +111,10 @@ DEAL_II_PACKAGE_HANDLE(ADOLC LIBRARIES REQUIRED ADOLC_LIBRARY ${_additional_library} - INCLUDE_DIRS + INCLUDE_DIRS REQUIRED ADOLC_INCLUDE_DIR ${_additional_include_dirs} - USER_INCLUDE_DIRS + USER_INCLUDE_DIRS REQUIRED ADOLC_INCLUDE_DIR ${_additional_include_dirs} CLEAR ADOLC_INCLUDE_DIR ADOLC_LIBRARY ADOLC_SETTINGS_H diff --git a/cmake/modules/FindCUDA.cmake b/cmake/modules/FindCUDA.cmake index c8bf61da12..6058386907 100644 --- a/cmake/modules/FindCUDA.cmake +++ b/cmake/modules/FindCUDA.cmake @@ -43,13 +43,10 @@ IF(CUDA_FOUND) MESSAGE(STATUS "Configured to use CUDA installation at ${CUDA_TOOLKIT_ROOT_DIR}") ENDIF() -SET(_cuda_libraries ${CUDA_LIBRARIES} ${CUDA_cusparse_LIBRARY} - ${CUDA_cusolver_LIBRARY}) -SET(_cuda_include_dirs ${CUDA_INCLUDE_DIRS}) DEAL_II_PACKAGE_HANDLE(CUDA - LIBRARIES REQUIRED _cuda_libraries - INCLUDE_DIRS REQUIRED _cuda_include_dirs - USER_INCLUDE_DIRS REQUIRED _cuda_include_dirs + LIBRARIES REQUIRED CUDA_LIBRARIES CUDA_cusparse_LIBRARY CUDA_cusolver_LIBRARY + INCLUDE_DIRS REQUIRED CUDA_INCLUDE_DIRS + USER_INCLUDE_DIRS REQUIRED CUDA_INCLUDE_DIRS CLEAR CUDA_cublas_device_LIBRARY CUDA_cublas_LIBRARY -- 2.39.5