From 171fbf879fa5b2a991192cae72eb5fed61cec522 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 9 Oct 2020 22:00:02 +0000 Subject: [PATCH 1/2] cmake: fix typo in CUDA_GENERATION=Auto cache --- cmake/OpenCVDetectCUDA.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/OpenCVDetectCUDA.cmake b/cmake/OpenCVDetectCUDA.cmake index c55f9f1903..c7cfebe50f 100644 --- a/cmake/OpenCVDetectCUDA.cmake +++ b/cmake/OpenCVDetectCUDA.cmake @@ -198,7 +198,7 @@ if(CUDA_FOUND) if(${status} EQUAL 0) # cache detected values - set(OPENCV_CACHE_CUDA_ACTIVE_CC ${${result_list}} CACHE INTERNAL "") + set(OPENCV_CACHE_CUDA_ACTIVE_CC ${${output}} CACHE INTERNAL "") set(OPENCV_CACHE_CUDA_ACTIVE_CC_check "${__cache_key_check}" CACHE INTERNAL "") endif() endif() From dc15187f1b6784ef2ece30dae223570811eaddff Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sat, 10 Oct 2020 20:14:29 +0000 Subject: [PATCH 2/2] release: OpenCV 3.4.12 --- modules/core/include/opencv2/core/version.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp index 00172f809e..c5d015afe0 100644 --- a/modules/core/include/opencv2/core/version.hpp +++ b/modules/core/include/opencv2/core/version.hpp @@ -8,7 +8,7 @@ #define CV_VERSION_MAJOR 3 #define CV_VERSION_MINOR 4 #define CV_VERSION_REVISION 12 -#define CV_VERSION_STATUS "-pre" +#define CV_VERSION_STATUS "" #define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR(__A) CVAUX_STR_EXP(__A)