Merge pull request #14091 from alalek:core_cache_dir_version_update

e783e667 · Alexander Alekhin · 26087e28 · 6e90b85c · e783e667
Commit e783e667 authored Mar 19, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

filesystem.cpp modules/core/src/utils/filesystem.cpp +1 -1

No files found.
--- a/modules/core/src/utils/filesystem.cpp
+++ b/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))
                {