3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tm_build_fixes'

Browse Source
This commit is contained in:
tamasmeszaros 2020-10-26 10:59:54 +01:00
commit efe157025e
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -393,6 +393,7 @@ endif ()
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
set(OpenGL_GL_PREFERENCE "LEGACY")
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
# Find glew or use bundled version # Find glew or use bundled version

6
deps/PNG/PNG.cmake vendored
View File

@ -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 prusaslicer_add_cmake_project(PNG
GIT_REPOSITORY https://github.com/glennrp/libpng.git GIT_REPOSITORY https://github.com/glennrp/libpng.git
@ -10,7 +6,7 @@ prusaslicer_add_cmake_project(PNG
CMAKE_ARGS CMAKE_ARGS
-DPNG_SHARED=OFF -DPNG_SHARED=OFF
-DPNG_STATIC=ON -DPNG_STATIC=ON
${_prefix_line} -DPNG_PREFIX=prusaslicer_
-DPNG_TESTS=OFF -DPNG_TESTS=OFF
) )