Merge branch 'tm_png_crashfix'

2020-10-23 11:16:43 +02:00 · 2020-10-23 11:16:43 +02:00 · 709b6b1a9c
commit 709b6b1a9c
parent 1d138e6e02 335f04ddf0
1 changed files with 6 additions and 0 deletions
--- a/deps/PNG/PNG.cmake
+++ b/deps/PNG/PNG.cmake
@ -1,3 +1,8 @@
+set(_prefix_line "")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    set(_prefix_line "-DPNG_PREFIX=prusaslicer_")
+endif()
+
 prusaslicer_add_cmake_project(PNG 
    GIT_REPOSITORY https://github.com/glennrp/libpng.git 
    GIT_TAG v1.6.35
@ -5,6 +10,7 @@ prusaslicer_add_cmake_project(PNG
    CMAKE_ARGS
        -DPNG_SHARED=OFF
        -DPNG_STATIC=ON
+        ${_prefix_line}
        -DPNG_TESTS=OFF
 )