Merge branch 'tm_build_fixes'

2020-10-26 10:59:54 +01:00 · 2020-10-26 10:59:54 +01:00 · efe157025e
commit efe157025e
parent d29a82e944 5ef309205d
2 changed files with 2 additions and 5 deletions
--- 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
--- 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
 )