Removed dependency on libtiff

supermerill · Aug 1, 2024 · 5e0f604 · 5e0f604
1 parent 905a049
commit 5e0f604
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/deps/+TIFF/TIFF.cmake b/deps/+TIFF/TIFF.cmake
diff --git a/deps/+wxWidgets/wxWidgets.cmake b/deps/+wxWidgets/wxWidgets.cmake
@@ -33,12 +33,12 @@ 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
         -DwxUSE_GLCANVAS_EGL=OFF
         -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
@@ -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)