From 9782a584f050cd14dc2d082a9fa54fdbe9421468 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 22 Oct 2020 16:44:05 +0200 Subject: [PATCH 1/2] Fix issues with libpng for good Add "prusaslicer_" prefix to static libpng in deps --- deps/PNG/PNG.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/PNG/PNG.cmake b/deps/PNG/PNG.cmake index 01bd984998..a4f081cc99 100644 --- a/deps/PNG/PNG.cmake +++ b/deps/PNG/PNG.cmake @@ -5,6 +5,7 @@ prusaslicer_add_cmake_project(PNG CMAKE_ARGS -DPNG_SHARED=OFF -DPNG_STATIC=ON + -DPNG_PREFIX=prusaslicer_ -DPNG_TESTS=OFF ) From 335f04ddf0fbba49b9f3f0dcbde283f49593da79 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Fri, 23 Oct 2020 11:10:00 +0200 Subject: [PATCH 2/2] Limit the png fix for Linux temporarily... --- deps/PNG/PNG.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/deps/PNG/PNG.cmake b/deps/PNG/PNG.cmake index a4f081cc99..3a8d22ae3a 100644 --- 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,7 +10,7 @@ prusaslicer_add_cmake_project(PNG CMAKE_ARGS -DPNG_SHARED=OFF -DPNG_STATIC=ON - -DPNG_PREFIX=prusaslicer_ + ${_prefix_line} -DPNG_TESTS=OFF )