diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2021-03-23 22:42:22 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2021-07-26 14:16:01 +0300 |
| commit | eca331ea354f4035163e187e2ededc865fb9037a (patch) | |
| tree | f98d4eb5587e72bdf23d2db46c366ef1f0c689ed /src/CMakeLists.txt | |
| parent | 02c6601281ece122cea0695b97584d1ad59eb1d6 (diff) | |
Fix wx linkage to tiff and jpeg
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f375e9c98..385625161 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,6 +57,9 @@ if (SLIC3R_GUI) include(${wxWidgets_USE_FILE}) + find_package(JPEG QUIET REQUIRED) + find_package(TIFF QUIET REQUIRED) + string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES}) if (NOT WX_PNG_BUILTIN) find_package(JPEG QUIET) @@ -81,6 +84,18 @@ if (SLIC3R_GUI) list(APPEND wxWidgets_LIBRARIES ${JPEG_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 (TIFF_FOUND AND NOT WX_JPEG_BUILTIN) + list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX jpeg) + list(APPEND wxWidgets_LIBRARIES ${JPEG_LIBRARIES}) + endif () + string(REGEX MATCH "wxexpat" WX_EXPAT_BUILTIN ${wxWidgets_LIBRARIES}) if (EXPAT_FOUND AND NOT WX_EXPAT_BUILTIN) list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX expat) |