|
@@ -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)
|