diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-02-17 22:52:32 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2021-02-17 22:52:32 +0000 |
| commit | 00e3ce1792b56de80200b7b5e1c5b8710fbc4047 (patch) | |
| tree | 2ff70009e76ea91a51d6da708ef1e51e91adfe83 /cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt | |
| parent | Mark BROKEN in 13/14 (via latest llvm update). (diff) | |
- Fix build with after devel/cereal update
PR: 253569
Submitted by: teodorsigaev@gmail.com (maintainer)
Diffstat (limited to 'cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt')
| -rw-r--r-- | cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt index b26800f0bccf..22efe2367d62 100644 --- a/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt +++ b/cad/PrusaSlicer/files/patch-src_slic3r_CMakeLists.txt @@ -1,8 +1,11 @@ ---- src/slic3r/CMakeLists.txt.orig 2021-01-12 12:07:42 UTC +--- src/slic3r/CMakeLists.txt.orig 2021-01-11 13:01:51 UTC +++ src/slic3r/CMakeLists.txt -@@ -234,7 +234,7 @@ encoding_check(libslic3r_gui) +@@ -232,9 +232,9 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES} - target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES}) + encoding_check(libslic3r_gui) + +-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES}) ++target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES}) -if (CMAKE_SYSTEM_NAME STREQUAL "Linux") +if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") |