From df819b27784d357ba6e8d4680c19342c78598004 Mon Sep 17 00:00:00 2001 From: ovlach Date: Thu, 27 Jul 2023 15:58:19 +0200 Subject: [PATCH] Use namespaces to link against libcereal >= 1.3.1 (#1596) https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc Co-authored-by: SoftFever --- CMakeLists.txt | 3 +++ src/CMakeLists.txt | 2 +- src/libslic3r/CMakeLists.txt | 2 +- src/slic3r/CMakeLists.txt | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 473f39a802..1b6d8d3e30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -503,6 +503,9 @@ find_package(glfw3 REQUIRED) # Find the Cereal serialization library find_package(cereal REQUIRED) +if (NOT TARGET cereal::cereal) + add_library(cereal::cereal ALIAS cereal) +endif () # l10n set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/i18n") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3a72307bc6..e87a31dc8f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -124,7 +124,7 @@ if (NOT WIN32 AND NOT APPLE) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY) endif () -target_link_libraries(OrcaSlicer libslic3r cereal) +target_link_libraries(OrcaSlicer libslic3r cereal::cereal) if (APPLE) # add_compile_options(-stdlib=libc++) # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index 64801a68c0..fbbbcd2ab5 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -480,7 +480,7 @@ set(OCCT_LIBS target_link_libraries(libslic3r libnest2d admesh - cereal + cereal::cereal libigl miniz boost_libs diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index 675274a0bd..e4362835de 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -496,7 +496,7 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES}) encoding_check(libslic3r_gui) -target_link_libraries(libslic3r_gui libslic3r cereal imgui minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto) +target_link_libraries(libslic3r_gui libslic3r cereal::cereal imgui minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto) #target_link_libraries(libslic3r_gui libslic3r cereal imgui minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw) if (MSVC)