From c829b7c04440d66e5adcf63245ac245a318e4d35 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Fri, 23 Oct 2020 16:28:14 +0200 Subject: [PATCH 1/2] Use legacy OpenGL linkage on Linux GLVND based libOpenGL.so is not present on every supported Linux, despite that appimage exclude list says so. It should be enough to just link to system specific libGL.so. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index d57e96a2e..68d4e4d1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -393,6 +393,7 @@ endif () find_package(PNG REQUIRED) +set(OpenGL_GL_PREFERENCE "LEGACY") find_package(OpenGL REQUIRED) # Find glew or use bundled version From 5ef309205d5259ebdc2e9c4cf1e047929cd1a1ef Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 26 Oct 2020 10:10:09 +0100 Subject: [PATCH 2/2] Do the png fix for all platforms --- deps/PNG/PNG.cmake | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/deps/PNG/PNG.cmake b/deps/PNG/PNG.cmake index 3a8d22ae3..3e55991fb 100644 --- a/deps/PNG/PNG.cmake +++ b/deps/PNG/PNG.cmake @@ -1,7 +1,3 @@ -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 @@ -10,7 +6,7 @@ prusaslicer_add_cmake_project(PNG CMAKE_ARGS -DPNG_SHARED=OFF -DPNG_STATIC=ON - ${_prefix_line} + -DPNG_PREFIX=prusaslicer_ -DPNG_TESTS=OFF )