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 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 )