removes unused libtiff

Caribou3d · Aug 2, 2024 · 49e646d · 49e646d
1 parent bb7924c
commit 49e646d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 60 deletions.
diff --git a/cmake/CPackConfig.cmake b/cmake/CPackConfig.cmake
@@ -10,31 +10,30 @@
 # usually begin with CPACK_<GENNAME>_xxxx.
 
 
-set(CPACK_BUILD_SOURCE_DIRS "/Users/wschadow/github/SuperSlicer-2.7;/Users/wschadow/github/SuperSlicer-2.7/build")
+set(CPACK_BUILD_SOURCE_DIRS "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7;/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/build")
 set(CPACK_CMAKE_GENERATOR "Unix Makefiles")
 set(CPACK_COMPONENTS_ALL "Devel;Unspecified")
 set(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
 set(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
-set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_FILE "/usr/local/Cellar/cmake/3.28.3/share/cmake/Templates/CPack.GenericDescription.txt")
+set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-3.25/Templates/CPack.GenericDescription.txt")
 set(CPACK_DEFAULT_PACKAGE_DESCRIPTION_SUMMARY "Slic3r built using CMake")
 set(CPACK_DMG_SLA_USE_RESOURCE_FILE_LICENSE "ON")
 set(CPACK_GENERATOR "STGZ;TGZ;TZ")
-set(CPACK_INNOSETUP_ARCHITECTURE "x64")
-set(CPACK_INSTALL_CMAKE_PROJECTS "/Users/wschadow/github/SuperSlicer-2.7/build;Slic3r;ALL;/")
+set(CPACK_INSTALL_CMAKE_PROJECTS "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/build;Slic3r;ALL;/")
 set(CPACK_INSTALL_PREFIX "/usr/local")
-set(CPACK_MODULE_PATH "/Users/wschadow/github/SuperSlicer-2.7/cmake/modules/")
+set(CPACK_MODULE_PATH "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/cmake/modules/")
 set(CPACK_NSIS_DISPLAY_NAME "SuperSlicer 2.7-rc")
 set(CPACK_NSIS_DISPLAY_NAME_SET "TRUE")
 set(CPACK_NSIS_INSTALLER_ICON_CODE "")
 set(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
 set(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
 set(CPACK_NSIS_PACKAGE_NAME "SuperSlicer 2.7-rc")
 set(CPACK_NSIS_UNINSTALL_NAME "Uninstall")
-set(CPACK_OBJDUMP_EXECUTABLE "/Library/Developer/CommandLineTools/usr/bin/objdump")
-set(CPACK_OSX_SYSROOT "/Library/Developer/CommandLineTools/SDKs/MacOSX11.1.sdk")
-set(CPACK_OUTPUT_CONFIG_FILE "/Users/wschadow/github/SuperSlicer-2.7/cmake/CPackConfig.cmake")
+set(CPACK_OBJCOPY_EXECUTABLE "/usr/bin/objcopy")
+set(CPACK_OBJDUMP_EXECUTABLE "/usr/bin/objdump")
+set(CPACK_OUTPUT_CONFIG_FILE "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/cmake/CPackConfig.cmake")
 set(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "/Users/wschadow/github/SuperSlicer-2.7/README.md")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/README.md")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool")
 set(CPACK_PACKAGE_EXECUTABLES "superSlicer")
 set(CPACK_PACKAGE_FILE_NAME "SuperSlicer-2.7-rc-Linux-x86_64")
@@ -47,12 +46,13 @@ set(CPACK_PACKAGE_VERSION "2.7.61.0")
 set(CPACK_PACKAGE_VERSION_MAJOR "2")
 set(CPACK_PACKAGE_VERSION_MINOR "0")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
-set(CPACK_RESOURCE_FILE_LICENSE "/Users/wschadow/github/SuperSlicer-2.7/LICENSE")
-set(CPACK_RESOURCE_FILE_README "/Users/wschadow/github/SuperSlicer-2.7/README.md")
-set(CPACK_RESOURCE_FILE_WELCOME "/Users/wschadow/github/SuperSlicer-2.7/README.md")
+set(CPACK_READELF_EXECUTABLE "/usr/bin/readelf")
+set(CPACK_RESOURCE_FILE_LICENSE "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/LICENSE")
+set(CPACK_RESOURCE_FILE_README "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/README.md")
+set(CPACK_RESOURCE_FILE_WELCOME "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/README.md")
 set(CPACK_SET_DESTDIR "OFF")
 set(CPACK_SOURCE_GENERATOR "TGZ;TZ")
-set(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/Users/wschadow/github/SuperSlicer-2.7/build/CPackSourceConfig.cmake")
+set(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/build/CPackSourceConfig.cmake")
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "SuperSlicer-2.7.61.0")
 set(CPACK_SOURCE_STRIP_FILES "")
 set(CPACK_STRIP_FILES "bin/superSlicer")
@@ -62,7 +62,7 @@ set(CPACK_TOPLEVEL_TAG "Linux-x86_64")
 set(CPACK_WIX_SIZEOF_VOID_P "8")
 
 if(NOT CPACK_PROPERTIES_FILE)
-  set(CPACK_PROPERTIES_FILE "/Users/wschadow/github/SuperSlicer-2.7/build/CPackProperties.cmake")
+  set(CPACK_PROPERTIES_FILE "/home/wschadow/github/Software/Slicer/SuperSlicer-2.7/build/CPackProperties.cmake")
 endif()
 
 if(EXISTS ${CPACK_PROPERTIES_FILE})

diff --git a/cmake/modules/FindwxWidgets.cmake b/cmake/modules/FindwxWidgets.cmake
@@ -266,7 +266,7 @@ endif()
 #=====================================================================
 if(wxWidgets_FIND_STYLE STREQUAL "win32")
   # Useful common wx libs needed by almost all components.
-  set(wxWidgets_COMMON_LIBRARIES png tiff jpeg zlib regex expat)
+  set(wxWidgets_COMMON_LIBRARIES png jpeg zlib regex expat)
 
   # DEPRECATED: Use find_package(wxWidgets COMPONENTS mono) instead.
   if(NOT wxWidgets_FIND_COMPONENTS)

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/deps/CMakeLists.txt b/deps/CMakeLists.txt
@@ -244,7 +244,7 @@ if (DEP_DEBUG AND NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
 
   # Exclude the libraries which have no problem to link to Debug builds in
   # Release mode (mostly C libraries)
-  set(DEP_DEBUG_EXCLUDES GMP MPFR OpenSSL NanoSVG TIFF JPEG ZLIB heatshrink)
+  set(DEP_DEBUG_EXCLUDES GMP MPFR OpenSSL NanoSVG JPEG ZLIB heatshrink)
   if (UNIX)
     # Making a separate debug build on Unix of wx is a nightmare
     list(APPEND DEP_DEBUG_EXCLUDES wxWidgets)

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)