diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bab7397a6..45c877559 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: CMAKE_CXX_STANDARD: 11 PKG_CONFIG_PATH: /usr/local/opt/libffi/lib/pkgconfig:/usr/local/opt/expat/lib/pkgconfig RAW_THERAPEE_MAJOR: '5' - RAW_THERAPEE_MINOR: '7' + RAW_THERAPEE_MINOR: '8' C_FLAGS: -Xpreprocessor -fopenmp /usr/local/lib/libomp.dylib -I/usr/local/include -I/usr/local/opt/gdk-pixbuf/include -I/usr/local/opt/libiconv/include -I/usr/local/opt/libxml2/include -I/usr/local/opt/expat/include -I/usr/local/opt/llvm/include run: | # GITHUB_REF is the ref that triggered the build, like refs/heads/new-feature - the next line parses that to REF: the branch name only (new-feature) @@ -54,6 +54,7 @@ jobs: -DOpenMP_CXX_FLAGS="${C_FLAGS}" \ -DCMAKE_AR="/usr/local/opt/llvm/bin/llvm-ar" \ -DCMAKE_RANLIB="/usr/local/opt/llvm/bin/llvm-ranlib" \ + -DCMAKE_OSX_DEPLOYMENT_TARGET="10.11" .. make --jobs make install diff --git a/rtgui/options.cc b/rtgui/options.cc index d85317c9d..5e9d48cc5 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -2291,7 +2291,6 @@ void Options::load(bool lightweight) } } else { - #ifdef WIN32 WCHAR pathW[MAX_PATH] = {0}; @@ -2334,14 +2333,13 @@ void Options::load(bool lightweight) #endif if (path != nullptr) { cacheBaseDir = Glib::ustring(path); - + if (!Glib::path_is_absolute(cacheBaseDir)) { Glib::ustring msg = Glib::ustring::compose("Cache base dir %1 is not absolute", cacheBaseDir); throw Error(msg); } } - // No environment variable provided, so falling back to the multi user mode, if enabled else if (options.multiUser) { #ifdef WIN32