juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-31 00:52:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing zlib and libpng build on Linux

Browse Source
This commit is contained in:
tamasmeszaros
2018-05-21 17:42:46 +02:00
parent 6cc4e99632
commit b3c49cbbe6
23 changed files with 5704 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xs/CMakeLists.txt
View File

@@ -351,13 +351,18 @@ if(RASTERIZER_USE_SYSTEM_LIBPNG)
target_compile_definitions(rasterizer PRIVATE ${PNG_DEFINITIONS})
else()
add_subdirectory( ${LIBDIR}/png/zlib)
add_subdirectory( ${LIBDIR}/png/libpng )
target_include_directories( png_static PRIVATE
set(ZLIB_INCLUDE_DIR
${LIBDIR}/png/zlib
${CMAKE_CURRENT_BINARY_DIR}/src/png/zlib
)
add_subdirectory( ${LIBDIR}/png/libpng )
target_include_directories(rasterizer PRIVATE
${LIBDIR}/png/libpng
${CMAKE_CURRENT_BINARY_DIR}/src/png/libpng
)
target_link_libraries(rasterizer PRIVATE png_static zlibstatic)
endif()