From cf9723b7ccd7f9ccc6ec0776cec04ae7486a740e Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Mon, 22 Mar 2021 13:00:14 +0100
Subject: [PATCH] Add Cereal the new way

---
 deps/CMakeLists.txt         |  3 ++-
 deps/Cereal/Cereal.cmake    |  6 ++++++
 deps/deps-unix-common.cmake | 18 +++++++++---------
 deps/deps-windows.cmake     | 24 ++++++++++++------------
 4 files changed, 29 insertions(+), 22 deletions(-)
 create mode 100644 deps/Cereal/Cereal.cmake

diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 1c774e84b..1bfce488d 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -146,6 +146,7 @@ if (NOT EXPAT_FOUND)
     set(EXPAT_PKG dep_EXPAT)
 endif ()
 
+include(Cereal/Cereal.cmake)
 include(GLEW/GLEW.cmake)
 include(OpenCSG/OpenCSG.cmake)
 include(GMP/GMP.cmake)
@@ -169,7 +170,7 @@ set(_dep_list
     dep_TBB
     dep_CURL
     dep_wxWidgets
-    dep_cereal
+    dep_Cereal
     dep_NLopt
     dep_openvdb
     dep_OpenCSG
diff --git a/deps/Cereal/Cereal.cmake b/deps/Cereal/Cereal.cmake
new file mode 100644
index 000000000..73aeedd05
--- /dev/null
+++ b/deps/Cereal/Cereal.cmake
@@ -0,0 +1,6 @@
+prusaslicer_add_cmake_project(Cereal
+    URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
+#    URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
+    CMAKE_ARGS
+        -DJUST_INSTALL_CEREAL=on
+)
\ No newline at end of file
diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake
index 23f718105..4b83f4dc7 100644
--- a/deps/deps-unix-common.cmake
+++ b/deps/deps-unix-common.cmake
@@ -18,15 +18,15 @@ endif ()
 #     message(WARNING "No EXPAT dev package found in system, building static library. Consider installing the system package.")
 # endif ()
 
-ExternalProject_Add(dep_cereal
-    EXCLUDE_FROM_ALL 1
-    URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
-#    URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
-    CMAKE_ARGS
-        -DJUST_INSTALL_CEREAL=on
-        -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
-        ${DEP_CMAKE_OPTS}
-)
+# ExternalProject_Add(dep_cereal
+#     EXCLUDE_FROM_ALL 1
+#     URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
+# #    URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
+#     CMAKE_ARGS
+#         -DJUST_INSTALL_CEREAL=on
+#         -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
+#         ${DEP_CMAKE_OPTS}
+# )
 
 ExternalProject_Add(dep_qhull
     EXCLUDE_FROM_ALL 1
diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake
index f071db3d3..3ec4f6ebf 100644
--- a/deps/deps-windows.cmake
+++ b/deps/deps-windows.cmake
@@ -81,18 +81,18 @@ ExternalProject_Add(dep_boost
     INSTALL_COMMAND ""   # b2 does that already
 )
 
-ExternalProject_Add(dep_cereal
-    EXCLUDE_FROM_ALL 1
-    URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
-#    URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
-    CMAKE_GENERATOR "${DEP_MSVC_GEN}"
-    CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
-    CMAKE_ARGS
-        -DJUST_INSTALL_CEREAL=on
-        "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
-    BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
-    INSTALL_COMMAND ""
-)
+# ExternalProject_Add(dep_cereal
+#     EXCLUDE_FROM_ALL 1
+#     URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
+# #    URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
+#     CMAKE_GENERATOR "${DEP_MSVC_GEN}"
+#     CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
+#     CMAKE_ARGS
+#         -DJUST_INSTALL_CEREAL=on
+#         "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
+#     BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
+#     INSTALL_COMMAND ""
+# )
 
 # if (${DEPS_BITS} EQUAL 32)
 #     set(DEP_LIBCURL_TARGET "x86")