From e170819ea275103de4517a3de4a8886d0cb249fc Mon Sep 17 00:00:00 2001 From: Alok Meshram Date: Mon, 24 Jun 2024 19:56:19 -0700 Subject: [PATCH] Put -std=gnu++17 under gcc version >=14.1 to avoid compile-time error from earlier implementation of __int28 --- src/libslic3r/CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 228e53ff7..eca70c451 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -456,10 +456,12 @@ if (_opts) target_compile_options(libslic3r_cgal PRIVATE "${_opts_bad}") endif() -set_property(TARGET libslic3r PROPERTY CXX_STANDARD 17) -set_property(TARGET libslic3r PROPERTY CXX_EXTENSIONS OFF) -set_property(TARGET libslic3r_cgal PROPERTY CXX_STANDARD 17) -set_property(TARGET libslic3r_cgal PROPERTY CXX_EXTENSIONS OFF) +if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14.1) + set_property(TARGET libslic3r PROPERTY CXX_STANDARD 17) + set_property(TARGET libslic3r PROPERTY CXX_EXTENSIONS OFF) + set_property(TARGET libslic3r_cgal PROPERTY CXX_STANDARD 17) + set_property(TARGET libslic3r_cgal PROPERTY CXX_EXTENSIONS OFF) +endif() target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} libigl mcut)