3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-09 14:55:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add PNG and wxWidgets 3.1.3 uniformly to all platforms with cmake build.

Browse source 
wx is built with png as a dependency, wxpng is disabled.
This commit is contained in:
tamasmeszaros 2020-04-28 09:56:54 +02:00
parent 2bd524849a
commit 572b5ba8bb
37 changed files with 13948 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -369,9 +369,9 @@ include_directories(BEFORE SYSTEM ${EIGEN3_INCLUDE_DIR})
# Find expat or use bundled version
# Always use the system libexpat on Linux.
if (NOT SLIC3R_STATIC OR CMAKE_SYSTEM_NAME STREQUAL "Linux")
find_package(EXPAT)
endif ()
find_package(EXPAT)
if (NOT EXPAT_FOUND)
add_library(expat STATIC
${LIBDIR}/expat/xmlparse.c
@ -382,7 +382,8 @@ if (NOT EXPAT_FOUND)
set(EXPAT_INCLUDE_DIRS ${LIBDIR}/expat/)
set(EXPAT_LIBRARIES expat)
endif ()
include_directories(${EXPAT_INCLUDE_DIRS})
find_package(PNG REQUIRED)
find_package(OpenGL REQUIRED)