From 6264fe64b429942f6433e856654e6a40a2f7000e Mon Sep 17 00:00:00 2001 From: Dzmitry Neviadomski Date: Fri, 8 Mar 2024 18:40:23 +0300 Subject: [PATCH] FIX: Support building with latest Xcode 15.3 (#4367) * FIX: Support building with latest Xcode 15.3 Downgrade 'enum-constexpr-conversion' error to warning. Signed-off-by: Dzmitry Neviadomski * FIX: Do not assume libdeflate is not installed on the system Explicitly disable libdeflate support in TIFF depencency. PrusaSlicer already does that. Signed-off-by: Dzmitry Neviadomski * FIX: Downgrade enum-constexpr-conversion warning only on AppleClang 15+ Signed-off-by: Dzmitry Neviadomski --------- Signed-off-by: Dzmitry Neviadomski --- CMakeLists.txt | 4 ++++ deps/TIFF/TIFF.cmake | 1 + 2 files changed, 5 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f75c16f7..d0cec2845 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -262,6 +262,10 @@ if (NOT MSVC AND ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMP add_compile_options(-Wno-deprecated-declarations) endif() + if (${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" AND ${CMAKE_CXX_COMPILER_VERSION} VERSION_GREATER 15) + add_compile_options(-Wno-error=enum-constexpr-conversion) + endif() + #GCC generates loads of -Wunknown-pragmas when compiling igl. The fix is not easy due to a bug in gcc, see # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66943 or # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53431 diff --git a/deps/TIFF/TIFF.cmake b/deps/TIFF/TIFF.cmake index b9c004d65..01d72428b 100644 --- a/deps/TIFF/TIFF.cmake +++ b/deps/TIFF/TIFF.cmake @@ -11,6 +11,7 @@ if (APPLE) -Dwebp:BOOL=OFF -Djbig:BOOL=OFF -Dzstd:BOOL=OFF + -Dlibdeflate:BOOL=OFF -Dpixarlog:BOOL=OFF ) else()