diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2021-07-26 14:25:06 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2021-07-26 14:25:06 +0300 |
| commit | 088e34740e562bb5301b803c534713c7c3a321c9 (patch) | |
| tree | 049f834318fb3899ec6ae6defe2ce561642d1044 /src/CMakeLists.txt | |
| parent | db8c57b938342935a3ceaf89af43b1a983c32ac8 (diff) | |
Fix messed up wx find procedure
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 385625161..bbade8a97 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -57,31 +57,13 @@ if (SLIC3R_GUI) include(${wxWidgets_USE_FILE}) - find_package(JPEG QUIET REQUIRED) - find_package(TIFF QUIET REQUIRED) + find_package(JPEG QUIET) + find_package(TIFF QUIET) string(REGEX MATCH "wxpng" WX_PNG_BUILTIN ${wxWidgets_LIBRARIES}) - if (NOT WX_PNG_BUILTIN) - find_package(JPEG QUIET) - if (PNG_FOUND) - list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX png) - list(APPEND wxWidgets_LIBRARIES ${PNG_LIBRARIES}) - endif () - endif () - - string(REGEX MATCH "wxtiff" WX_TIFF_BUILTIN ${wxWidgets_LIBRARIES}) - if (NOT WX_TIFF_BUILTIN) - find_package(TIFF QUIET) - if (TIFF_FOUND) - list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX tiff) - list(APPEND wxWidgets_LIBRARIES ${TIFF_LIBRARIES}) - endif () - 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}) + if (PNG_FOUND AND NOT WX_PNG_BUILTIN) + list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX png) + list(APPEND wxWidgets_LIBRARIES ${PNG_LIBRARIES}) endif () string(REGEX MATCH "wxtiff" WX_TIFF_BUILTIN ${wxWidgets_LIBRARIES}) @@ -91,7 +73,7 @@ if (SLIC3R_GUI) endif () string(REGEX MATCH "wxjpeg" WX_JPEG_BUILTIN ${wxWidgets_LIBRARIES}) - if (TIFF_FOUND AND NOT WX_JPEG_BUILTIN) + if (JPEG_FOUND AND NOT WX_JPEG_BUILTIN) list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX jpeg) list(APPEND wxWidgets_LIBRARIES ${JPEG_LIBRARIES}) endif () @@ -101,6 +83,7 @@ if (SLIC3R_GUI) list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX expat) list(APPEND wxWidgets_LIBRARIES ${EXPAT_LIBRARIES}) endif () + # This is an issue in the new wxWidgets cmake build, doesn't deal with librt find_library(LIBRT rt) if(LIBRT) |