diff --git a/CMakeLists.txt b/CMakeLists.txt index fbe2b53b..2aec5767 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -265,12 +265,12 @@ if(HIPIFY_CLANG_TESTS OR HIPIFY_CLANG_TESTS_ONLY) require_program(lit) require_program(FileCheck) - set(CUDA_TOOLKIT_ROOT_DIR OFF CACHE PATH "Path to CUDA Toolkit to use in hipify-clang unit testing") - set(CUDA_SDK_ROOT_DIR "" CACHE PATH "Path to CUDA Toolkit Samples") - set(CUDA_DNN_ROOT_DIR "" CACHE PATH "Path to cuDNN") - set(CUDA_CUB_ROOT_DIR "" CACHE PATH "Path to CUB") + set(CUDA_TOOLKIT_ROOT_DIR "" CACHE PATH "Path to CUDA Toolkit to use in hipify-clang unit testing") + set(CUDA_SDK_ROOT_DIR "" CACHE PATH "Path to CUDA Toolkit Samples") + set(CUDA_DNN_ROOT_DIR "" CACHE PATH "Path to cuDNN") + set(CUDA_CUB_ROOT_DIR "" CACHE PATH "Path to CUB") - if(DEFINED CUDA_TOOLKIT_ROOT_DIR AND NOT CUDA_TOOLKIT_ROOT_DIR MATCHES "OFF") + if(NOT CUDA_TOOLKIT_ROOT_DIR STREQUAL "" AND NOT CUDA_TOOLKIT_ROOT_DIR MATCHES "OFF") if(NOT DEFINED CUDAToolkit_ROOT OR CUDAToolkit_ROOT MATCHES "OFF") set(CUDAToolkit_ROOT "${CUDA_TOOLKIT_ROOT_DIR}") endif() @@ -299,18 +299,21 @@ if(HIPIFY_CLANG_TESTS OR HIPIFY_CLANG_TESTS_ONLY) set(CUDA_TOOLKIT_ROOT_DIR "${CUDAToolkit_LIBRARY_ROOT}") endif() - if(WIN32 AND CUDA_SDK_ROOT_DIR STREQUAL "" AND CUDA_VERSION VERSION_LESS "11.6") - set(NVCUDASAMPLES "NVCUDASAMPLES${CUDA_VERSION_MAJOR}_${CUDA_VERSION_MINOR}_ROOT") - if(DEFINED ENV{${NVCUDASAMPLES}}) - set(CUDA_SDK_ROOT_DIR "$ENV{${NVCUDASAMPLES}}") - string(REPLACE "\\" "/" CUDA_SDK_ROOT_DIR ${CUDA_SDK_ROOT_DIR}) + if(CUDA_SDK_ROOT_DIR STREQUAL "") + if(WIN32) + if(CUDA_VERSION VERSION_LESS "11.6") + set(NVCUDASAMPLES "NVCUDASAMPLES${CUDA_VERSION_MAJOR}_${CUDA_VERSION_MINOR}_ROOT") + if(DEFINED ENV{${NVCUDASAMPLES}}) + set(CUDA_SDK_ROOT_DIR "$ENV{${NVCUDASAMPLES}}") + string(REPLACE "\\" "/" CUDA_SDK_ROOT_DIR ${CUDA_SDK_ROOT_DIR}) + endif() + endif() + elseif(UNIX) + if(NOT CUDA_TOOLKIT_ROOT_DIR STREQUAL "" AND NOT CUDA_TOOLKIT_ROOT_DIR STREQUAL "OFF" AND CUDA_VERSION VERSION_LESS "10.1") + set(CUDA_SDK_ROOT_DIR "${CUDA_TOOLKIT_ROOT_DIR}/samples") + endif() endif() endif() - - if(UNIX AND CUDA_SDK_ROOT_DIR STREQUAL "" AND NOT CUDA_TOOLKIT_ROOT_DIR STREQUAL "" AND NOT CUDA_TOOLKIT_ROOT_DIR STREQUAL "OFF" AND CUDA_VERSION VERSION_LESS "10.1") - set(CUDA_SDK_ROOT_DIR "${CUDA_TOOLKIT_ROOT_DIR}/samples") - endif() - if(CUDA_SDK_ROOT_DIR STREQUAL "") set(CUDA_SDK_ROOT_DIR OFF) endif()