Merge pull request #22981 from alalek:core_freeze_cache_dir_prefix_4.x
This commit is contained in:
commit
da43778c1f
@ -503,7 +503,7 @@ cv::String getCacheDirectory(const char* sub_directory_name, const char* configu
|
|||||||
if (utils::fs::isDirectory(default_cache_path))
|
if (utils::fs::isDirectory(default_cache_path))
|
||||||
{
|
{
|
||||||
cv::String default_cache_path_base = utils::fs::join(default_cache_path, "opencv");
|
cv::String default_cache_path_base = utils::fs::join(default_cache_path, "opencv");
|
||||||
default_cache_path = utils::fs::join(default_cache_path_base, CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) CV_VERSION_STATUS);
|
default_cache_path = utils::fs::join(default_cache_path_base, "4.x" CV_VERSION_STATUS);
|
||||||
if (utils::getConfigurationParameterBool("OPENCV_CACHE_SHOW_CLEANUP_MESSAGE", true)
|
if (utils::getConfigurationParameterBool("OPENCV_CACHE_SHOW_CLEANUP_MESSAGE", true)
|
||||||
&& !utils::fs::isDirectory(default_cache_path))
|
&& !utils::fs::isDirectory(default_cache_path))
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user