Skip to content

Fix macOS build with CMake 4.x and Xcode 16+ #10717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karlingen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix macOS build with CMake 4.x and Xcode 16+ #10717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/Assimp/Assimp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ bambustudio_add_cmake_project(Assimp
-DASSIMP_BUILD_GLTF_IMPORTER=ON
-DASSIMP_BUILD_OBJ_IMPORTER=ON
-DASSIMP_BUILD_FBX_IMPORTER=ON
-DASSIMP_BUILD_ZLIB=ON
-DASSIMP_BUILD_ZLIB=OFF
-DASSIMP_WARNINGS_AS_ERRORS=OFF
-DBUILD_WITH_STATIC_CRT=OFF
)
Expand Down
1 change: 1 addition & 0 deletions deps/deps-macos.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ set(DEP_CMAKE_OPTS
"-DCMAKE_C_FLAGS=${DEP_WERRORS_SDK}"
"-DCMAKE_FIND_FRAMEWORK=LAST"
"-DCMAKE_FIND_APPBUNDLE=LAST"
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
)

include("deps-unix-common.cmake")
Expand Down
2 changes: 1 addition & 1 deletion src/clipper2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ target_include_directories(Clipper2
if (WIN32)
target_compile_options(Clipper2 PRIVATE /W4 /WX)
else()
target_compile_options(Clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror)
target_compile_options(Clipper2 PRIVATE -Wall -Wextra -Wpedantic -Werror -Wno-unknown-warning-option)
target_link_libraries(Clipper2 PUBLIC -lm)
if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14.1)
target_compile_options(Clipper2 PRIVATE -Wno-error=template-id-cdtor)
Expand Down
8 changes: 4 additions & 4 deletions src/slic3r/GUI/MediaPlayCtrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ class MediaPlayCtrl : public wxPanel
static bool get_stream_url(std::string *url = nullptr);

private:
static constexpr wxMediaState MEDIASTATE_IDLE = (wxMediaState) 3;
static constexpr wxMediaState MEDIASTATE_INITIALIZING = (wxMediaState) 4;
static constexpr wxMediaState MEDIASTATE_LOADING = (wxMediaState) 5;
static constexpr wxMediaState MEDIASTATE_BUFFERING = (wxMediaState) 6;
static const wxMediaState MEDIASTATE_IDLE = (wxMediaState) 3;
static const wxMediaState MEDIASTATE_INITIALIZING = (wxMediaState) 4;
static const wxMediaState MEDIASTATE_LOADING = (wxMediaState) 5;
static const wxMediaState MEDIASTATE_BUFFERING = (wxMediaState) 6;

// token
std::shared_ptr<int> m_token = std::make_shared<int>(0);
Expand Down
2 changes: 1 addition & 1 deletion src/slic3r/GUI/wxMediaCtrl2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class wxMediaCtrl2 : public wxWindow

int GetLastError() const { return m_error; }

static constexpr wxMediaState MEDIASTATE_BUFFERING = (wxMediaState) 6;
static const wxMediaState MEDIASTATE_BUFFERING = (wxMediaState) 6;

protected:
void DoSetSize(int x, int y, int width, int height, int sizeFlags) override;
Expand Down