superslicer/trunk/superslicer-cereal.patch

   1 diff --git a/cmake/modules/Findcereal.cmake b/cmake/modules/Findcereal.cmake
   2 deleted file mode 100644
   3 index b4829757e..000000000
   4 --- a/cmake/modules/Findcereal.cmake
   5 +++ /dev/null
   6 @@ -1,26 +0,0 @@
   7 -set(_q "")
   8 -if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
   9 -    set(_q QUIET)
  10 -    set(_quietly TRUE)
  11 -endif()
  12 -find_package(${CMAKE_FIND_PACKAGE_NAME} ${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION} CONFIG ${_q})
  13 -
  14 -if (NOT ${CMAKE_FIND_PACKAGE_NAME}_FOUND)
  15 -    # Fall-back solution to find the Cereal serialization library header file
  16 -    include(CheckIncludeFileCXX)
  17 -    add_library(cereal INTERFACE)
  18 -    target_include_directories(cereal INTERFACE include)
  19 -
  20 -    if (_quietly)
  21 -        set(CMAKE_REQUIRED_QUIET ON)
  22 -    endif()
  23 -    CHECK_INCLUDE_FILE_CXX("cereal/cereal.hpp" HAVE_CEREAL_H)
  24 -
  25 -    if (NOT HAVE_CEREAL_H)
  26 -        if (${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
  27 -            message(FATAL_ERROR "Cereal library not found. Please install the dependency.")
  28 -        elseif(NOT _quietly)
  29 -            message(WARNING "Cereal library not found.")
  30 -        endif()
  31 -    endif ()
  32 -endif()
  33 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  34 index 01ef37905..98dbafa01 100644
  35 --- a/src/CMakeLists.txt
  36 +++ b/src/CMakeLists.txt
  37 @@ -139,7 +139,7 @@ if (NOT WIN32)
  38      set_target_properties(Slic3r PROPERTIES OUTPUT_NAME "${SLIC3R_APP_CMD}")
  39  endif ()
  40
  41 -target_link_libraries(Slic3r libslic3r cereal)
  42 +target_link_libraries(Slic3r libslic3r)
  43  if (APPLE)
  44  #    add_compile_options(-stdlib=libc++)
  45  #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
  46 diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
  47 index 7048fb60c..95c5ed9e2 100644
  48 --- a/src/libslic3r/CMakeLists.txt
  49 +++ b/src/libslic3r/CMakeLists.txt
  50 @@ -356,7 +356,6 @@ target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS})
  51  target_link_libraries(libslic3r
  52      libnest2d
  53      admesh
  54 -    cereal
  55      libigl
  56      miniz
  57      boost_libs
  58 diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
  59 index fe3d15425..24be67592 100644
  60 --- a/src/slic3r/CMakeLists.txt
  61 +++ b/src/slic3r/CMakeLists.txt
  62 @@ -291,7 +291,7 @@ target_compile_definitions(libslic3r_gui PRIVATE $<$<BOOL:${SLIC3R_ALPHA}>:SLIC3
  63
  64  encoding_check(libslic3r_gui)
  65
  66 -target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
  67 +target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi exif angelscript libcurl ${wxWidgets_LIBRARIES})
  68
  69  if (MSVC)
  70      target_link_libraries(libslic3r_gui Setupapi.lib)