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 | |
| 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')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/libslic3r/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/slic3r/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 2 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}") diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index eb0f87e50..30614100f 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -272,7 +272,8 @@ endif () encoding_check(libslic3r) target_compile_definitions(libslic3r PUBLIC -DUSE_TBB -DTBB_USE_CAPTURED_EXCEPTION=0) -target_include_directories(libslic3r PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LIBNEST2D_INCLUDES} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(libslic3r PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(libslic3r PUBLIC ${EXPAT_INCLUDE_DIRS}) target_link_libraries(libslic3r libnest2d admesh diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index 2ac8a1ff0..3711b12a1 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -204,7 +204,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES}) encoding_check(libslic3r_gui) -target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES}) +target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi libcurl ${wxWidgets_LIBRARIES} rt) if(APPLE) target_link_libraries(libslic3r_gui ${DISKARBITRATION_LIBRARY}) |