GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 06:05:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed dependency on libtiff

Browse Source
This commit is contained in:
Lukas Matena 2024-04-08 13:30:20 +02:00
parent f769db569f
commit f12e0b4d21
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
deps/+TIFF/TIFF.cmake vendored
View File

@ -1,15 +0,0 @@
add_cmake_project(TIFF
URL https://gitlab.com/libtiff/libtiff/-/archive/v4.6.0/libtiff-v4.6.0.zip
URL_HASH SHA256=5d652432123223338a6ee642a6499d98ebc5a702f8a065571e1001d4c08c37e6
CMAKE_ARGS
-Dtiff-tools:BOOL=OFF
-Dtiff-tests:BOOL=OFF
-Dlzma:BOOL=OFF
-Dwebp:BOOL=OFF
-Djbig:BOOL=OFF
-Dzstd:BOOL=OFF
-Dpixarlog:BOOL=OFF
-Dlibdeflate:BOOL=OFF
)
set(DEP_TIFF_DEPENDS ZLIB PNG JPEG OpenGL)

4
deps/+wxWidgets/wxWidgets.cmake vendored
View File

@ -45,7 +45,7 @@ add_cmake_project(wxWidgets
-DwxUSE_REGEX=OFF -DwxUSE_REGEX=OFF
-DwxUSE_LIBXPM=builtin -DwxUSE_LIBXPM=builtin
-DwxUSE_LIBJPEG=sys -DwxUSE_LIBJPEG=sys
-DwxUSE_LIBTIFF=sys -DwxUSE_LIBTIFF=OFF
-DwxUSE_EXPAT=sys -DwxUSE_EXPAT=sys
-DwxUSE_LIBSDL=OFF -DwxUSE_LIBSDL=OFF
-DwxUSE_XTEST=OFF -DwxUSE_XTEST=OFF
@ -55,4 +55,4 @@ add_cmake_project(wxWidgets
${_wx_secretstore} ${_wx_secretstore}
) )
set(DEP_wxWidgets_DEPENDS ZLIB PNG EXPAT TIFF JPEG NanoSVG) set(DEP_wxWidgets_DEPENDS ZLIB PNG EXPAT JPEG NanoSVG)

7
src/CMakeLists.txt
View File

@ -60,7 +60,6 @@ if (SLIC3R_GUI)
endif() endif()
find_package(JPEG MODULE QUIET) find_package(JPEG MODULE QUIET)
find_package(TIFF MODULE QUIET) # Tiff exported config is broken for static build
find_package(NanoSVG REQUIRED) find_package(NanoSVG REQUIRED)
string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES}) string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES})
@ -69,12 +68,6 @@ if (SLIC3R_GUI)
list(APPEND wxWidgets_LIBRARIES ${PNG_LIBRARIES}) list(APPEND wxWidgets_LIBRARIES ${PNG_LIBRARIES})
endif () endif ()
string(REGEX MATCH "wxtiff" WX_TIFF_BUILTIN ${wxWidgets_LIBRARIES})
if (TIFF_FOUND AND NOT WX_TIFF_BUILTIN)
list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX tiff)
list(APPEND wxWidgets_LIBRARIES ${TIFF_LIBRARIES})
endif ()
string(REGEX MATCH "wxjpeg" WX_JPEG_BUILTIN ${wxWidgets_LIBRARIES}) string(REGEX MATCH "wxjpeg" WX_JPEG_BUILTIN ${wxWidgets_LIBRARIES})
if (JPEG_FOUND AND NOT WX_JPEG_BUILTIN) if (JPEG_FOUND AND NOT WX_JPEG_BUILTIN)
list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX jpeg) list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX jpeg)