Merge pull request #14091 from alalek:core_cache_dir_version_update

pull/14104/head
Alexander Alekhin 6 years ago
commit e783e6677e
  1. 2
      modules/core/src/utils/filesystem.cpp

@ -495,7 +495,7 @@ cv::String getCacheDirectory(const char* sub_directory_name, const char* configu
if (utils::fs::isDirectory(default_cache_path))
{
cv::String default_cache_path_base = utils::fs::join(default_cache_path, "opencv");
default_cache_path = utils::fs::join(default_cache_path_base, "4.0" CV_VERSION_STATUS);
default_cache_path = utils::fs::join(default_cache_path_base, CVAUX_STR(CV_VERSION_MAJOR) "." CVAUX_STR(CV_VERSION_MINOR) CV_VERSION_STATUS);
if (utils::getConfigurationParameterBool("OPENCV_CACHE_SHOW_CLEANUP_MESSAGE", true)
&& !utils::fs::isDirectory(default_cache_path))
{

Loading…
Cancel
Save