Skip to content

ENH: Allow using system CGAL #11827

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
hadess wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ENH: Allow using system CGAL #11827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc0a1ab
FIX: Fix libslic3r_cgal not depending on Cereal
hadess Aug 7, 2026
4761df5
ENH: Allow using system CGAL
hadess Aug 4, 2026
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
9 changes: 7 additions & 2 deletions deps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ option(DEP_BUILD_FREETYPE "Compile freetype" ON)
option(DEP_BUILD_WXWIDGETS "Compile wxWidgets" ON)
option(DEP_BUILD_GMP "Compile GMP" ON)
option(DEP_BUILD_MPFR "Compile MPFR" ON)
option(DEP_BUILD_CGAL "Compile CGAL" ON)
option(DEP_BUILD_FFMPEG "Compile ffmpeg" ON)
option(DEP_BUILD_LIBHARU "Compile libharu" ON)

Expand Down Expand Up @@ -268,7 +269,11 @@ if (DEP_BUILD_MPFR)
include(MPFR/MPFR.cmake)
set(MPFR_PKG dep_MPFR)
endif ()
include(CGAL/CGAL.cmake)
set(CGAL_PKG "")
if (DEP_BUILD_CGAL)
include(CGAL/CGAL.cmake)
set(CGAL_PKG dep_CGAL)
endif()

include(NLopt/NLopt.cmake)

Expand Down Expand Up @@ -314,7 +319,7 @@ set(_dep_list
dep_OpenVDB
dep_OpenCSG
dep_OpenCV
dep_CGAL
${CGAL_PKG}
${OPENSSL_PKG}
${GLFW_PKG}
${PNG_PKG}
Expand Down
3 changes: 2 additions & 1 deletion src/libslic3r/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,8 @@ if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 14.1)
set_property(TARGET libslic3r_cgal PROPERTY CXX_EXTENSIONS OFF)
endif()

target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} libigl mcut)
find_package(cereal REQUIRED)
target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} libigl mcut cereal)

if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround
target_compile_definitions(libslic3r_cgal PRIVATE CGAL_DO_NOT_USE_MPZF)
Expand Down
Loading