From 5e0f60416f35bf9e023ebf4c3d355a992518cbe5 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Mon, 8 Apr 2024 13:30:20 +0200 Subject: [PATCH] Removed dependency on libtiff --- deps/+TIFF/TIFF.cmake | 15 --------------- deps/+wxWidgets/wxWidgets.cmake | 4 ++-- src/CMakeLists.txt | 7 ------- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 deps/+TIFF/TIFF.cmake diff --git a/deps/+TIFF/TIFF.cmake b/deps/+TIFF/TIFF.cmake deleted file mode 100644 index 9281dd5a6c3..00000000000 --- a/deps/+TIFF/TIFF.cmake +++ /dev/null @@ -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) diff --git a/deps/+wxWidgets/wxWidgets.cmake b/deps/+wxWidgets/wxWidgets.cmake index ac15a48d0e9..8aa7b9ba19d 100644 --- a/deps/+wxWidgets/wxWidgets.cmake +++ b/deps/+wxWidgets/wxWidgets.cmake @@ -33,7 +33,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 @@ -41,4 +41,4 @@ add_cmake_project(wxWidgets -DwxUSE_WEBREQUEST=OFF ) -set(DEP_wxWidgets_DEPENDS ZLIB PNG EXPAT TIFF JPEG NanoSVG) +set(DEP_wxWidgets_DEPENDS ZLIB PNG EXPAT JPEG NanoSVG) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 101c258b9f7..fd694918924 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -68,7 +68,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}) @@ -77,12 +76,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)