diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2019-03-25 13:40:45 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2019-03-25 13:40:45 +0300 |
| commit | 6c7120a291c2666ab82d78510af47980b0a8b656 (patch) | |
| tree | 1cc314b99e9a65d051afe596d4630cdb56fa1337 /src/CMakeLists.txt | |
| parent | 630d266c4b5b13c2dc1bae52a9bc4930ed5ae2c1 (diff) | |
Build: Fix libz dependency required by libcurl
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 225a23898..2c3a7eab4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -92,16 +92,13 @@ endif () # Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries. if (SLIC3R_GUI) + target_link_libraries(slic3r libslic3r_gui ${wxWidgets_LIBRARIES}) - # FIXME: Workaround for missing zlib (still needed by libgio despite wxzlib being present) - find_package(ZLIB REQUIRED) - - target_link_libraries(slic3r libslic3r_gui ${wxWidgets_LIBRARIES} ${ZLIB_LIBRARIES}) - - # Configure libcurl & OpenSSL + # Configure libcurl and its dependencies OpenSSL & zlib find_package(CURL REQUIRED) + find_package(ZLIB REQUIRED) target_include_directories(slic3r PRIVATE ${CURL_INCLUDE_DIRS}) - target_link_libraries(slic3r CURL::libcurl) + target_link_libraries(slic3r ${CURL_LIBRARIES} ${ZLIB_LIBRARIES}) if (SLIC3R_STATIC) if (NOT APPLE) # libcurl is always linked dynamically to the system libcurl on OSX. |