3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Cereal the new way

Browse Source
This commit is contained in:
tamasmeszaros 2021-03-22 13:00:14 +01:00
parent 974967640b
commit cf9723b7cc
4 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/CMakeLists.txt vendored
View File

@ -146,6 +146,7 @@ if (NOT EXPAT_FOUND)
set(EXPAT_PKG dep_EXPAT) set(EXPAT_PKG dep_EXPAT)
endif () endif ()
include(Cereal/Cereal.cmake)
include(GLEW/GLEW.cmake) include(GLEW/GLEW.cmake)
include(OpenCSG/OpenCSG.cmake) include(OpenCSG/OpenCSG.cmake)
include(GMP/GMP.cmake) include(GMP/GMP.cmake)
@ -169,7 +170,7 @@ set(_dep_list
dep_TBB dep_TBB
dep_CURL dep_CURL
dep_wxWidgets dep_wxWidgets
dep_cereal dep_Cereal
dep_NLopt dep_NLopt
dep_openvdb dep_openvdb
dep_OpenCSG dep_OpenCSG

6
deps/Cereal/Cereal.cmake vendored Normal file
View File

@ -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
)

18
deps/deps-unix-common.cmake vendored
View File

@ -18,15 +18,15 @@ endif ()
# message(WARNING "No EXPAT dev package found in system, building static library. Consider installing the system package.") # message(WARNING "No EXPAT dev package found in system, building static library. Consider installing the system package.")
# endif () # endif ()
ExternalProject_Add(dep_cereal # ExternalProject_Add(dep_cereal
EXCLUDE_FROM_ALL 1 # EXCLUDE_FROM_ALL 1
URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz" # URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
# URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae # # URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
CMAKE_ARGS # CMAKE_ARGS
-DJUST_INSTALL_CEREAL=on # -DJUST_INSTALL_CEREAL=on
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local # -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
${DEP_CMAKE_OPTS} # ${DEP_CMAKE_OPTS}
) # )
ExternalProject_Add(dep_qhull ExternalProject_Add(dep_qhull
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1

24
deps/deps-windows.cmake vendored
View File

@ -81,18 +81,18 @@ ExternalProject_Add(dep_boost
INSTALL_COMMAND "" # b2 does that already INSTALL_COMMAND "" # b2 does that already
) )
ExternalProject_Add(dep_cereal # ExternalProject_Add(dep_cereal
EXCLUDE_FROM_ALL 1 # EXCLUDE_FROM_ALL 1
URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz" # URL "https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz"
# URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae # # URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
CMAKE_GENERATOR "${DEP_MSVC_GEN}" # CMAKE_GENERATOR "${DEP_MSVC_GEN}"
CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" # CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
CMAKE_ARGS # CMAKE_ARGS
-DJUST_INSTALL_CEREAL=on # -DJUST_INSTALL_CEREAL=on
"-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local" # "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj # BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
INSTALL_COMMAND "" # INSTALL_COMMAND ""
) # )
# if (${DEPS_BITS} EQUAL 32) # if (${DEPS_BITS} EQUAL 32)
# set(DEP_LIBCURL_TARGET "x86") # set(DEP_LIBCURL_TARGET "x86")