Add macOS packaging, CMake/linking, config path

Add macOS packaging and notarization support (Info.plist template, entitlements, packaging script that builds .app and signed/.notarized DMG). Improve CMake handling: bump project version to 2.7.5, better detection and linking for freetype/openjph/pugixml/uhdr/bzip2, add helper solidify_link_oiio_static_tail, handle dnd_glfw macOS target or source file, and tidy platform-specific link logic. Implement config path resolution (resolveConfigPath + configPathFromExecutable) and expose settingsConfigPath so the app loads sldf_config.toml from application bundle or executable location; UI and settings use the new variable. Add unit tests for settings (tests/solidify_settings_tests.cpp) and test target in CMake. Misc: bump VERSION_MINOR/PATCH macros, small GLFW macOS context hints, and add .DS_Store to .gitignore.

Author: ssh4net

.gitignore

@@ -365,3 +365,4 @@ MigrationBackup/
 # Fody - auto-generated XML schema
 FodyWeavers.xsd
 /tmp
+.DS_Store

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(Solidify LANGUAGES CXX C VERSION 0.1.0)
+project(Solidify LANGUAGES CXX C VERSION 2.7.5)
 
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Available build configurations" FORCE)
 
@@ -84,6 +84,25 @@ if(NOT EXISTS "${DND_GLFW_INCLUDE_DIR}/dnd_glfw.h")
     message(FATAL_ERROR "dnd_glfw.h not found. Set DND_GLFW_INCLUDE_DIR to its location.")
 endif()
 
+set(SOLIDIFY_DND_GLFW_TARGET "")
+set(SOLIDIFY_DND_GLFW_SOURCE "")
+if(APPLE)
+    enable_language(OBJCXX)
+    if(NOT TARGET dnd_glfw AND EXISTS "${DND_GLFW_INCLUDE_DIR}/CMakeLists.txt")
+        add_subdirectory("${DND_GLFW_INCLUDE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/dnd_glfw")
+    endif()
+    if(TARGET dnd_glfw)
+        if(TARGET dnd_glfw_macos)
+            target_link_libraries(dnd_glfw_macos PUBLIC glfw3::glfw3)
+        endif()
+        set(SOLIDIFY_DND_GLFW_TARGET dnd_glfw)
+    elseif(EXISTS "${DND_GLFW_INCLUDE_DIR}/dnd_glfw_macos.mm")
+        set(SOLIDIFY_DND_GLFW_SOURCE "${DND_GLFW_INCLUDE_DIR}/dnd_glfw_macos.mm")
+    else()
+        message(FATAL_ERROR "dnd_glfw macOS implementation not found. Expected dnd_glfw_macos.mm or a dnd_glfw CMake target.")
+    endif()
+endif()
+
 if(NOT SOLIDIFY_TOML11_DIR)
     find_path(TOML11_INCLUDE_DIR
         NAMES toml.hpp toml11/toml.hpp
@@ -200,6 +219,22 @@ if(NOT TARGET BZip2::BZip2)
     endif()
 endif()
 
+find_package(freetype CONFIG QUIET)
+if(NOT TARGET Freetype::Freetype AND NOT TARGET freetype)
+    find_package(Freetype QUIET)
+endif()
+if(NOT TARGET Freetype::Freetype AND NOT TARGET freetype)
+    find_library(FREETYPE_LIBRARY NAMES freetype libfreetype HINTS ${CMAKE_LIBRARY_PATH})
+    find_path(FREETYPE_INCLUDE_DIR NAMES ft2build.h PATH_SUFFIXES freetype2 HINTS ${CMAKE_INCLUDE_PATH})
+    if(FREETYPE_LIBRARY)
+        add_library(Freetype::Freetype UNKNOWN IMPORTED)
+        set_target_properties(Freetype::Freetype PROPERTIES IMPORTED_LOCATION "${FREETYPE_LIBRARY}")
+        if(FREETYPE_INCLUDE_DIR)
+            set_target_properties(Freetype::Freetype PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${FREETYPE_INCLUDE_DIR}")
+        endif()
+    endif()
+endif()
+
 find_package(dng_sdk CONFIG QUIET)
 if(NOT TARGET dng_sdk::dng_sdk)
     find_library(DNG_SDK_LIBRARY NAMES dng_sdk HINTS ${CMAKE_LIBRARY_PATH})
@@ -245,6 +280,71 @@ if(NOT TARGET hwy::hwy)
 endif()
 find_package(spdlog CONFIG REQUIRED)
 
+find_library(SOLIDIFY_OPENJPH_LINK_LIBRARY NAMES openjph libopenjph HINTS ${CMAKE_LIBRARY_PATH})
+find_library(SOLIDIFY_BZIP2_LINK_LIBRARY NAMES bz2_static bz2 bzip2 HINTS ${CMAKE_LIBRARY_PATH})
+find_library(SOLIDIFY_PUGIXML_LINK_LIBRARY NAMES pugixml HINTS ${CMAKE_LIBRARY_PATH})
+find_library(SOLIDIFY_UHDR_LINK_LIBRARY NAMES uhdr libuhdr HINTS ${CMAKE_LIBRARY_PATH})
+
+set(SOLIDIFY_FREETYPE_LINK_ITEM "")
+if(TARGET Freetype::Freetype)
+    set(SOLIDIFY_FREETYPE_LINK_ITEM Freetype::Freetype)
+elseif(TARGET freetype)
+    set(SOLIDIFY_FREETYPE_LINK_ITEM freetype)
+endif()
+
+set(SOLIDIFY_OPENJPH_LINK_ITEM "")
+if(SOLIDIFY_OPENJPH_LINK_LIBRARY)
+    set(SOLIDIFY_OPENJPH_LINK_ITEM "${SOLIDIFY_OPENJPH_LINK_LIBRARY}")
+elseif(TARGET openjph)
+    set(SOLIDIFY_OPENJPH_LINK_ITEM openjph)
+endif()
+
+set(SOLIDIFY_PUGIXML_LINK_ITEM "")
+if(TARGET pugixml::pugixml)
+    set(SOLIDIFY_PUGIXML_LINK_ITEM pugixml::pugixml)
+elseif(SOLIDIFY_PUGIXML_LINK_LIBRARY)
+    set(SOLIDIFY_PUGIXML_LINK_ITEM "${SOLIDIFY_PUGIXML_LINK_LIBRARY}")
+endif()
+
+set(SOLIDIFY_UHDR_LINK_ITEM "")
+if(TARGET libuhdr::libuhdr)
+    set(SOLIDIFY_UHDR_LINK_ITEM libuhdr::libuhdr)
+elseif(SOLIDIFY_UHDR_LINK_LIBRARY)
+    set(SOLIDIFY_UHDR_LINK_ITEM "${SOLIDIFY_UHDR_LINK_LIBRARY}")
+endif()
+
+set(SOLIDIFY_BZIP2_LINK_ITEM "")
+if(TARGET BZip2::BZip2)
+    set(SOLIDIFY_BZIP2_LINK_ITEM BZip2::BZip2)
+elseif(SOLIDIFY_BZIP2_LINK_LIBRARY)
+    set(SOLIDIFY_BZIP2_LINK_ITEM "${SOLIDIFY_BZIP2_LINK_LIBRARY}")
+endif()
+
+function(solidify_link_oiio_static_tail target_name)
+    target_link_libraries(${target_name} PRIVATE
+        ${SOLIDIFY_FREETYPE_LINK_ITEM}
+        ${SOLIDIFY_PUGIXML_LINK_ITEM}
+        ${SOLIDIFY_UHDR_LINK_ITEM}
+        ${SOLIDIFY_BZIP2_LINK_ITEM}
+    )
+
+    if(APPLE AND SOLIDIFY_OPENJPH_LINK_LIBRARY)
+        target_link_libraries(${target_name} PRIVATE
+            "-Wl,-force_load,${SOLIDIFY_OPENJPH_LINK_LIBRARY}"
+        )
+    elseif(SOLIDIFY_OPENJPH_LINK_ITEM)
+        target_link_libraries(${target_name} PRIVATE ${SOLIDIFY_OPENJPH_LINK_ITEM})
+    endif()
+
+    if(UNIX AND NOT APPLE AND SOLIDIFY_BZIP2_LINK_LIBRARY)
+        target_link_libraries(${target_name} PRIVATE
+            "-Wl,--whole-archive"
+            "${SOLIDIFY_BZIP2_LINK_LIBRARY}"
+            "-Wl,--no-whole-archive"
+        )
+    endif()
+endfunction()
+
 file(GLOB IMGUI_SOURCES CONFIGURE_DEPENDS
     "${IMGUI_INCLUDE_DIR}/imgui.cpp"
     "${IMGUI_INCLUDE_DIR}/imgui_draw.cpp"
@@ -285,6 +385,7 @@ set(SOLIDIFY_SOURCES
     Solidify/src/pushpull.cpp
     Solidify/src/solidify.cpp
     Solidify/src/pch.cpp
+    ${SOLIDIFY_DND_GLFW_SOURCE}
     ${SOLIDIFY_EMBEDDED_FONT_SOURCE}
 )
 
@@ -312,14 +413,16 @@ target_link_libraries(Solidify PRIVATE
     OpenGL::GL
 )
 
+if(SOLIDIFY_DND_GLFW_TARGET)
+    target_link_libraries(Solidify PRIVATE "${SOLIDIFY_DND_GLFW_TARGET}")
+endif()
+
+solidify_link_oiio_static_tail(Solidify)
+
 if(UNIX AND NOT APPLE)
     target_link_libraries(Solidify PRIVATE
         dl
         m
-        $<$<TARGET_EXISTS:pugixml::pugixml>:pugixml::pugixml>
-        $<$<TARGET_EXISTS:libuhdr::libuhdr>:libuhdr::libuhdr>
-        $<$<TARGET_EXISTS:openjph>:openjph>
-        $<$<TARGET_EXISTS:BZip2::BZip2>:BZip2::BZip2>
         ${X11_LIBRARIES}
         ${X11_Xrandr_LIB}
         ${X11_Xinerama_LIB}
@@ -330,27 +433,6 @@ if(UNIX AND NOT APPLE)
     if(OpenMP_CXX_FOUND)
         target_link_libraries(Solidify PRIVATE OpenMP::OpenMP_CXX)
     endif()
-
-    find_library(SOLIDIFY_OPENJPH_LINK_LIBRARY NAMES openjph libopenjph HINTS ${CMAKE_LIBRARY_PATH})
-    find_library(SOLIDIFY_BZIP2_LINK_LIBRARY NAMES bz2_static bz2 bzip2 HINTS ${CMAKE_LIBRARY_PATH})
-    find_library(SOLIDIFY_PUGIXML_LINK_LIBRARY NAMES pugixml HINTS ${CMAKE_LIBRARY_PATH})
-    find_library(SOLIDIFY_UHDR_LINK_LIBRARY NAMES uhdr libuhdr HINTS ${CMAKE_LIBRARY_PATH})
-    foreach(_solidify_tail_lib
-            ${SOLIDIFY_OPENJPH_LINK_LIBRARY}
-            ${SOLIDIFY_BZIP2_LINK_LIBRARY}
-            ${SOLIDIFY_PUGIXML_LINK_LIBRARY}
-            ${SOLIDIFY_UHDR_LINK_LIBRARY})
-        if(_solidify_tail_lib)
-            target_link_libraries(Solidify PRIVATE "${_solidify_tail_lib}")
-        endif()
-    endforeach()
-    if(SOLIDIFY_BZIP2_LINK_LIBRARY)
-        target_link_libraries(Solidify PRIVATE
-            "-Wl,--whole-archive"
-            "${SOLIDIFY_BZIP2_LINK_LIBRARY}"
-            "-Wl,--no-whole-archive"
-        )
-    endif()
 endif()
 
 if(WIN32)
@@ -403,25 +485,12 @@ function(solidify_configure_image_tool target_name)
         hwy::hwy
         spdlog::spdlog
     )
+    solidify_link_oiio_static_tail(${target_name})
     if(UNIX AND NOT APPLE)
         target_link_libraries(${target_name} PRIVATE
             dl
             m
-            $<$<TARGET_EXISTS:pugixml::pugixml>:pugixml::pugixml>
-            $<$<TARGET_EXISTS:libuhdr::libuhdr>:libuhdr::libuhdr>
-            $<$<TARGET_EXISTS:openjph>:openjph>
-            $<$<TARGET_EXISTS:BZip2::BZip2>:BZip2::BZip2>
-            ${SOLIDIFY_OPENJPH_LINK_LIBRARY}
-            ${SOLIDIFY_PUGIXML_LINK_LIBRARY}
-            ${SOLIDIFY_UHDR_LINK_LIBRARY}
         )
-        if(SOLIDIFY_BZIP2_LINK_LIBRARY)
-            target_link_libraries(${target_name} PRIVATE
-                "-Wl,--whole-archive"
-                "${SOLIDIFY_BZIP2_LINK_LIBRARY}"
-                "-Wl,--no-whole-archive"
-            )
-        endif()
     endif()
 endfunction()
 
@@ -441,6 +510,13 @@ if(BUILD_TESTING)
     solidify_configure_image_tool(solidify_pushpull_tests)
     add_test(NAME solidify_pushpull_tests COMMAND solidify_pushpull_tests)
 
+    add_executable(solidify_settings_tests
+        tests/solidify_settings_tests.cpp
+        Solidify/src/settings.cpp
+    )
+    solidify_configure_image_tool(solidify_settings_tests)
+    add_test(NAME solidify_settings_tests COMMAND solidify_settings_tests)
+
     add_executable(solidify_pushpull_bench
         tests/solidify_pushpull_bench.cpp
         Solidify/src/pushpull.cpp

Solidify/src/UI.CPP

@@ -389,7 +389,7 @@ AppMenuBar()
     if (ImGui::BeginMenuBar()) {
         if (ImGui::BeginMenu("Files")) {
             if (ImGui::MenuItem("Reload Config")) {
-                if (loadSettingsDefaults("sldf_config.toml")) {
+                if (loadSettingsDefaults(settingsConfigPath)) {
                     ApplyConsoleVisibility();
                     ApplyVerbosity();
                     printSettings(settings);

Solidify/src/main.cpp

@@ -18,6 +18,13 @@
 
 #include "pch.h"
 
+#if defined(__APPLE__)
+#    include <limits.h>
+#    include <mach-o/dyld.h>
+#elif !defined(_WIN32)
+#    include <limits.h>
+#endif
+
 #ifdef _WIN32
 #    include "../resource.h"
 #endif
@@ -36,6 +43,79 @@ glfw_error_callback(int error, const char* description)
     spdlog::error("Glfw Error {}: {}", error, description);
 }
 
+static bool
+configPathFromExecutable(const std::filesystem::path& executablePath, std::string* outPath)
+{
+    if (outPath == nullptr || executablePath.empty()) {
+        return false;
+    }
+
+    std::error_code ec;
+    std::filesystem::path absolutePath = std::filesystem::absolute(executablePath, ec);
+    if (ec) {
+        absolutePath = executablePath;
+    }
+
+    const std::filesystem::path executableDir = absolutePath.parent_path();
+    std::filesystem::path candidate = executableDir.parent_path() / "Resources" / "sldf_config.toml";
+    ec.clear();
+    if (std::filesystem::exists(candidate, ec)) {
+        *outPath = candidate.string();
+        return true;
+    }
+
+    candidate = executableDir / "sldf_config.toml";
+    ec.clear();
+    if (std::filesystem::exists(candidate, ec)) {
+        *outPath = candidate.string();
+        return true;
+    }
+
+    return false;
+}
+
+static std::string
+resolveConfigPath(const char* argv0)
+{
+    std::string resolvedPath;
+
+#ifdef _WIN32
+    char executablePath[MAX_PATH] = {};
+    const DWORD length = GetModuleFileNameA(nullptr, executablePath, static_cast<DWORD>(sizeof(executablePath)));
+    if (length > 0 && length < static_cast<DWORD>(sizeof(executablePath))
+        && configPathFromExecutable(std::filesystem::path(executablePath), &resolvedPath)) {
+        return resolvedPath;
+    }
+#elif defined(__APPLE__)
+    uint32_t bufferSize = PATH_MAX;
+    std::vector<char> executablePath(bufferSize);
+    int result = _NSGetExecutablePath(executablePath.data(), &bufferSize);
+    if (result == -1) {
+        executablePath.assign(bufferSize, '\0');
+        result = _NSGetExecutablePath(executablePath.data(), &bufferSize);
+    }
+    if (result == 0 && configPathFromExecutable(std::filesystem::path(executablePath.data()), &resolvedPath)) {
+        return resolvedPath;
+    }
+#else
+    char executablePath[PATH_MAX] = {};
+    const ssize_t length = readlink("/proc/self/exe", executablePath, sizeof(executablePath) - 1u);
+    if (length > 0) {
+        executablePath[length] = '\0';
+        if (configPathFromExecutable(std::filesystem::path(executablePath), &resolvedPath)) {
+            return resolvedPath;
+        }
+    }
+#endif
+
+    if (argv0 != nullptr && argv0[0] != '\0'
+        && configPathFromExecutable(std::filesystem::path(argv0), &resolvedPath)) {
+        return resolvedPath;
+    }
+
+    return "sldf_config.toml";
+}
+
 static void
 onDragEnter(GLFWwindow* window, const dnd_glfw::DragEvent& event, void* userData)
 {
@@ -107,7 +187,6 @@ int
 main(int argc, char* argv[])
 {
     (void)argc;
-    (void)argv;
 
 #ifdef _WIN32
     AllocConsole();
@@ -126,8 +205,10 @@ main(int argc, char* argv[])
     spdlog::info("Build from: {} {}", __DATE__, __TIME__);
     spdlog::info("Log started at: {}", ctime(&timestamp));
 
-    if (!loadSettingsDefaults("sldf_config.toml")) {
-        spdlog::error("Can not load [sldf_config.toml]. Using default settings.");
+    settingsConfigPath = resolveConfigPath(argv != nullptr && argc > 0 ? argv[0] : nullptr);
+    spdlog::info("Config path: {}", settingsConfigPath);
+    if (!loadSettingsDefaults(settingsConfigPath)) {
+        spdlog::error("Can not load [{}]. Using default settings.", settingsConfigPath);
         settings.reSettings();
         settingsDefaults = settings;
     }
@@ -144,9 +225,19 @@ main(int argc, char* argv[])
         return 1;
     }
 
+#if defined(__APPLE__)
+    const char* glsl_version = "#version 150";
+    glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
+    glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+    glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
+#else
     const char* glsl_version = "#version 130";
+    glfwWindowHint(GLFW_CLIENT_API, GLFW_OPENGL_API);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+#endif
     glfwWindowHint(GLFW_RESIZABLE, GLFW_FALSE);
     glfwWindowHint(GLFW_FLOATING, GLFW_TRUE);
 

Solidify/src/settings.cpp

@@ -22,6 +22,7 @@
 
 Settings settings;
 Settings settingsDefaults;
+std::string settingsConfigPath = "sldf_config.toml";
 
 template<typename T>
 static void

Solidify/src/settings.h

@@ -155,6 +155,7 @@ struct Settings {
 
 extern Settings settings;
 extern Settings settingsDefaults;
+extern std::string settingsConfigPath;
 
 bool
 loadSettings(Settings& settings, const std::string& filename);