diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2020-04-28 10:56:54 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2020-04-28 16:01:56 +0300 |
| commit | 572b5ba8bbf7903d4c0b67f6f441002ee1680cab (patch) | |
| tree | b8f5abf7291859c9c27132fd01dd03ed257970ed /src/CMakeLists.txt | |
| parent | 2bd524849ad8aeeb8fb96f29c9ef9d28dfeaa727 (diff) | |
Add PNG and wxWidgets 3.1.3 uniformly to all platforms with cmake build.
wx is built with png as a dependency, wxpng is disabled.
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b0eab9bcc..cdc8e0a13 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -59,6 +59,10 @@ if (SLIC3R_GUI) include(${wxWidgets_USE_FILE}) + list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX png) + list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX expat) + list(APPEND wxWidgets_LIBRARIES ${PNG_LIBRARIES} ${EXPAT_LIBRARIES}) + # list(REMOVE_ITEM wxWidgets_LIBRARIES oleacc) message(STATUS "wx libs: ${wxWidgets_LIBRARIES}") |