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

Fix and merge PR #7809

Browse Source
This commit is contained in:
tamasmeszaros 2022-02-22 11:36:27 +01:00
parent 0ffcfd8393
commit cc788ebb64
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -506,9 +506,12 @@ endif ()
# Find the Cereal serialization library # Find the Cereal serialization library
find_package(cereal REQUIRED) find_package(cereal REQUIRED)
add_library(libcereal INTERFACE)
if (NOT TARGET cereal::cereal) if (NOT TARGET cereal::cereal)
add_library(cereal::cereal ALIAS cereal) target_link_libraries(libcereal INTERFACE cereal)
endif () else()
target_link_libraries(libcereal INTERFACE cereal::cereal)
endif()
# l10n # l10n
set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization") set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")

2
src/CMakeLists.txt
View File

@ -126,7 +126,7 @@ if (NOT WIN32 AND NOT APPLE)
set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer") set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
endif () endif ()
target_link_libraries(PrusaSlicer libslic3r cereal::cereal) target_link_libraries(PrusaSlicer libslic3r libcereal)
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

@ -358,7 +358,7 @@ find_package(JPEG REQUIRED)
target_link_libraries(libslic3r target_link_libraries(libslic3r
libnest2d libnest2d
admesh admesh
cereal::cereal libcereal
libigl libigl
miniz miniz
boost_libs boost_libs

2
src/slic3r/CMakeLists.txt
View File

@ -270,7 +270,7 @@ endforeach()
encoding_check(libslic3r_gui) encoding_check(libslic3r_gui)
target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
if (MSVC) if (MSVC)
target_link_libraries(libslic3r_gui Setupapi.lib) target_link_libraries(libslic3r_gui Setupapi.lib)