Set MacOS Paths

Moved paths for collateral to application space on MacOS

Author: Ericzklm

SerialPrograms/CMakeLists.txt

@@ -2199,6 +2199,14 @@ if (APPLE)
         MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/cmake/MacOSXBundleInfo.plist.in
         RESOURCE ${SerialPrograms_ICON}
     )
+
+    add_custom_command(
+        TARGET SerialPrograms
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory
+        "${CMAKE_CURRENT_SOURCE_DIR}/../Resources"
+        "$<TARGET_FILE_DIR:SerialPrograms>/../Resources"
+    )
 else() # WIN and Linux:
     add_executable(SerialPrograms WIN32 ${MAIN_SOURCES})
 endif()

SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp

@@ -6,6 +6,7 @@
 
 #include <iostream>
 #include <set>
+#include <QStandardPaths>
 #include <QCryptographicHash>
 #include "Common/Cpp/Containers/Pimpl.tpp"
 #include "Common/Cpp/LifetimeSanitizer.h"
@@ -106,15 +107,25 @@ GlobalSettings::GlobalSettings()
         false,
         "<b>Stats File:</b><br>Use the stats file here. Multiple instances of the program can use the same file.",
         LockMode::LOCK_WHILE_RUNNING,
+        #if defined(__APPLE__)
+        QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString() + "/UserSettings/PA-Stats.txt",
+        QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString() + "/UserSettings/PA-Stats.txt"
+        #else
         "UserSettings/PA-Stats.txt",
         "UserSettings/PA-Stats.txt"
+        #endif
     )
     , TEMP_FOLDER(
         false,
         "<b>Temp Folder:</b><br>Place temporary files in this directory.",
         LockMode::LOCK_WHILE_RUNNING,
+        #if defined(__APPLE__)
+        QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString() + "/TempFiles/",
+        QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString() + "/TempFiles/"
+        #else
         "TempFiles/",
         "TempFiles/"
+        #endif
     )
     , THEME(CONSTRUCT_TOKEN)
     , WINDOW_SIZE(

SerialPrograms/Source/CommonFramework/Globals.cpp

@@ -5,6 +5,7 @@
  */
 
 #include <QCoreApplication>
+#include <QStandardPaths>
 #include <QFile>
 #include <QFileInfo>
 #include <QDir>
@@ -112,9 +113,14 @@ std::string get_training_path(){
 }
 
 std::string get_runtime_base_path(){
+    //  On MacOS, find the writable application support directory
     if (QSysInfo::productType() == "macos" || QSysInfo::productType() == "osx"){
-        QString application_dir_path = get_application_base_dir_path();
-        return application_dir_path.toStdString() + "/";
+        QString appSupportPath = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+        QDir dir(appSupportPath);
+        if (!dir.exists()) {
+            dir.mkpath(".");
+        }
+        return appSupportPath.toStdString() + "/";
     }
     return "./";
 }