From 2c287a1186535f8f14ab65f352819695d24c93da Mon Sep 17 00:00:00 2001 From: supermerill Date: Sun, 12 Jan 2020 21:28:51 +0100 Subject: [PATCH] bugfix macos10 build using 10.13 as min sdk --- .github/workflows/ccpp_mac.yml | 4 ++-- src/slic3r/GUI/Tab.cpp | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ccpp_mac.yml b/.github/workflows/ccpp_mac.yml index 3fdce3b67..51788f734 100644 --- a/.github/workflows/ccpp_mac.yml +++ b/.github/workflows/ccpp_mac.yml @@ -18,7 +18,7 @@ jobs: run: mkdir deps/build - name: cmake deps working-directory: ./deps/build - run: cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" + run: cmake .. -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" - name: make deps working-directory: ./deps/build run: make @@ -29,7 +29,7 @@ jobs: run: mkdir build - name: cmake working-directory: ./build - run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.14" -DSLIC3R_STATIC=1 + run: cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" -DSLIC3R_STATIC=1 - name: make slic3r working-directory: ./build run: make slic3r diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 0e0aad5a0..73a01dffc 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -23,7 +23,10 @@ #include #include +#include #include +#include +#include #include "wxExtensions.hpp" #include @@ -1035,8 +1038,8 @@ bool Tab::create_pages(std::string setting_type_name) { std::cout << "create settings " << setting_type_name << "\n"; //search for the file - const auto ui_layout_file = (boost::filesystem::path(resources_dir()) / "ui_layout" / setting_type_name).make_preferred(); - if (!boost::filesystem::exists(ui_layout_file)) return false; + const boost::filesystem::path ui_layout_file = (boost::filesystem::path(resources_dir()) / "ui_layout" / setting_type_name).make_preferred(); + if (! boost::filesystem::exists(ui_layout_file)) return false; Slic3r::GUI::PageShp current_page; ConfigOptionsGroupShp current_group;