GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-24 02:14:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:SoftFever/OrcaSlicer

Browse Source
This commit is contained in:
SoftFever 2023-07-27 22:03:45 +08:00
commit 1a869cfca9
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -503,6 +503,9 @@ find_package(glfw3 REQUIRED)
# Find the Cereal serialization library # Find the Cereal serialization library
find_package(cereal REQUIRED) find_package(cereal REQUIRED)
if (NOT TARGET cereal::cereal)
add_library(cereal::cereal ALIAS cereal)
endif ()
# l10n # l10n
set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/i18n") set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/i18n")

2
src/CMakeLists.txt
View File

@ -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) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY)
endif () endif ()
target_link_libraries(OrcaSlicer libslic3r cereal) target_link_libraries(OrcaSlicer libslic3r cereal::cereal)
if (APPLE) if (APPLE)
# add_compile_options(-stdlib=libc++) # add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)

2
src/libslic3r/CMakeLists.txt
View File

@ -480,7 +480,7 @@ set(OCCT_LIBS
target_link_libraries(libslic3r target_link_libraries(libslic3r
libnest2d libnest2d
admesh admesh
cereal cereal::cereal
libigl libigl
miniz miniz
boost_libs boost_libs

2
src/slic3r/CMakeLists.txt
View File

@ -496,7 +496,7 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES})
encoding_check(libslic3r_gui) 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) #target_link_libraries(libslic3r_gui libslic3r cereal imgui minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw)
if (MSVC) if (MSVC)