Skip to content
Snippets Groups Projects
Commit 4361081e authored by Adrien Béraud's avatar Adrien Béraud
Browse files

osx: use official system data dir

Refs #67163

Change-Id: I0893e34cca8fbbab0cf011f3f698c16dcb559fc0
parent d2c82ff3
Branches
Tags
No related merge requests found
...@@ -311,7 +311,7 @@ get_cache_dir() ...@@ -311,7 +311,7 @@ get_cache_dir()
return get_home_dir() + DIR_SEPARATOR_STR + PACKAGE; return get_home_dir() + DIR_SEPARATOR_STR + PACKAGE;
#elif __APPLE__ #elif __APPLE__
return get_home_dir() + DIR_SEPARATOR_STR return get_home_dir() + DIR_SEPARATOR_STR
+ "Library" + DIR_SEPARATOR_STR + "Application Support" + "Library" + DIR_SEPARATOR_STR + "Caches"
+ DIR_SEPARATOR_STR + PACKAGE; + DIR_SEPARATOR_STR + PACKAGE;
#else #else
return get_home_dir() + DIR_SEPARATOR_STR + return get_home_dir() + DIR_SEPARATOR_STR +
...@@ -350,7 +350,11 @@ get_data_dir() ...@@ -350,7 +350,11 @@ get_data_dir()
{ {
#ifdef __ANDROID__ #ifdef __ANDROID__
return get_program_dir(); return get_program_dir();
#endif #elif __APPLE__
return get_home_dir() + DIR_SEPARATOR_STR
+ "Library" + DIR_SEPARATOR_STR + "Application Support"
+ DIR_SEPARATOR_STR + PACKAGE;
#else
const std::string data_home(XDG_DATA_HOME); const std::string data_home(XDG_DATA_HOME);
if (not data_home.empty()) if (not data_home.empty())
return data_home + DIR_SEPARATOR_STR + PACKAGE; return data_home + DIR_SEPARATOR_STR + PACKAGE;
...@@ -358,6 +362,7 @@ get_data_dir() ...@@ -358,6 +362,7 @@ get_data_dir()
// $HOME/.local/share should be used." // $HOME/.local/share should be used."
return get_home_dir() + DIR_SEPARATOR_STR ".local" DIR_SEPARATOR_STR return get_home_dir() + DIR_SEPARATOR_STR ".local" DIR_SEPARATOR_STR
"share" DIR_SEPARATOR_STR + PACKAGE; "share" DIR_SEPARATOR_STR + PACKAGE;
#endif
} }
}} // namespace ring::fileutils }} // namespace ring::fileutils
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment