Merge remote-tracking branch 'origin/master' into ys_search

2020-03-25 11:20:34 +01:00
parent 1010fff8af de06c5d659
commit 45d064d4cb
82 changed files with 12211 additions and 6689 deletions
--- a/src/slic3r/CMakeLists.txt
+++ b/src/slic3r/CMakeLists.txt
@@ -199,6 +199,10 @@ if(APPLE)
    target_link_libraries(libslic3r_gui ${DISKARBITRATION_LIBRARY})
 endif()

+if (SLIC3R_STATIC)
+    target_compile_definitions(libslic3r_gui PRIVATE OPENSSL_CERT_OVERRIDE)
+endif ()
+
 if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
    add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE)
 endif ()