mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-14 01:25:59 +08:00
Removed dependency on libtiff
This commit is contained in:
parent
f769db569f
commit
f12e0b4d21
15
deps/+TIFF/TIFF.cmake
vendored
15
deps/+TIFF/TIFF.cmake
vendored
@ -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
4
deps/+wxWidgets/wxWidgets.cmake
vendored
@ -45,7 +45,7 @@ add_cmake_project(wxWidgets
|
||||
-DwxUSE_REGEX=OFF
|
||||
-DwxUSE_LIBXPM=builtin
|
||||
-DwxUSE_LIBJPEG=sys
|
||||
-DwxUSE_LIBTIFF=sys
|
||||
-DwxUSE_LIBTIFF=OFF
|
||||
-DwxUSE_EXPAT=sys
|
||||
-DwxUSE_LIBSDL=OFF
|
||||
-DwxUSE_XTEST=OFF
|
||||
@ -55,4 +55,4 @@ add_cmake_project(wxWidgets
|
||||
${_wx_secretstore}
|
||||
)
|
||||
|
||||
set(DEP_wxWidgets_DEPENDS ZLIB PNG EXPAT TIFF JPEG NanoSVG)
|
||||
set(DEP_wxWidgets_DEPENDS ZLIB PNG EXPAT JPEG NanoSVG)
|
||||
|
@ -60,7 +60,6 @@ if (SLIC3R_GUI)
|
||||
endif()
|
||||
|
||||
find_package(JPEG MODULE QUIET)
|
||||
find_package(TIFF MODULE QUIET) # Tiff exported config is broken for static build
|
||||
find_package(NanoSVG REQUIRED)
|
||||
|
||||
string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES})
|
||||
@ -69,12 +68,6 @@ if (SLIC3R_GUI)
|
||||
list(APPEND wxWidgets_LIBRARIES ${PNG_LIBRARIES})
|
||||
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})
|
||||
if (JPEG_FOUND AND NOT WX_JPEG_BUILTIN)
|
||||
list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX jpeg)
|
||||
|
Loading…
x
Reference in New Issue
Block a user