diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f43fcfd25..d536b14be2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1592,6 +1592,8 @@ IF(WITH_CUDA) #SET(EMGU_CUDA_VERSION "${npp_major}.${npp_minor}.${npp_build}") IF ( (${cuda_major}) AND (${cuda_minor}) AND (${npp_build}) ) SET(EMGU_CUDA_VERSION "${cuda_major}.${cuda_minor}.${npp_build}") + ELSEIF (${CUDA_VERSION} AND (${npp_build}) ) + SET(EMGU_CUDA_VERSION "${CUDA_VERSION}.${npp_build}") ELSEIF (${CUDA_VERSION}) SET(EMGU_CUDA_VERSION "${CUDA_VERSION}") ENDIF() @@ -1709,10 +1711,14 @@ IF(WITH_CUDA) MESSAGE(STATUS "<<<<<<<<<<<<<<<< npp_build: ${npp_build} >>>>>>>>>>>>>>>>>>>>>> ") MESSAGE(STATUS "<<<<<<<<<<<<<<<< cuda_major: ${cuda_major} >>>>>>>>>>>>>>>>>>>>>> ") MESSAGE(STATUS "<<<<<<<<<<<<<<<< cuda_minor: ${cuda_minor} >>>>>>>>>>>>>>>>>>>>>> ") + MESSAGE(STATUS "<<<<<<<<<<<<<<<< CUDA_VERSION: ${CUDA_VERSION} >>>>>>>>>>>>>>>>>>>>>> ") + #MESSAGE(STATUS "<<<<<<<<<<<<<<<< CUDA_VERSION_MAJOR: ${CUDA_VERSION_MAJOR} >>>>>>>>>>>>>>>>>>>>>> ") + #MESSAGE(STATUS "<<<<<<<<<<<<<<<< CUDA_VERSION_MINOR: ${CUDA_VERSION_MINOR} >>>>>>>>>>>>>>>>>>>>>> ") #MESSAGE(STATUS "<<<<<<<<<<<<<<<< cuda_build: ${cuda_build} >>>>>>>>>>>>>>>>>>>>>> ") MESSAGE(STATUS "<<<<<<<<<<<<<<<< cudnn_version_major: ${CUDNN_VERSION_MAJOR} >>>>>>>>>>>>>>>>>>>>>> ") MESSAGE(STATUS "<<<<<<<<<<<<<<<< cudnn_version_minor: ${CUDNN_VERSION_MINOR} >>>>>>>>>>>>>>>>>>>>>> ") MESSAGE(STATUS "<<<<<<<<<<<<<<<< cudnn_version_patch: ${CUDNN_VERSION_PATCH} >>>>>>>>>>>>>>>>>>>>>> ") + MESSAGE(STATUS "<<<<<<<<<<<<<<<< EMGU_CUDA_VERSION: ${EMGU_CUDA_VERSION} >>>>>>>>>>>>>>>>>>>>>> ") #IF ("${npp_major}" STREQUAL "") # MESSAGE(FATAL_ERROR "CUDA is enabled, but failed to detect npp_major version")