Trying to fix build on linux
This commit is contained in:
parent
04e03c840d
commit
ae719abad0
1 changed files with 6 additions and 1 deletions
|
@ -40,6 +40,7 @@ if (SLIC3R_GUI)
|
||||||
find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl)
|
find_package(wxWidgets 3.0 REQUIRED COMPONENTS base core adv html gl)
|
||||||
else ()
|
else ()
|
||||||
find_package(wxWidgets 3.1 QUIET COMPONENTS base core adv html gl)
|
find_package(wxWidgets 3.1 QUIET COMPONENTS base core adv html gl)
|
||||||
|
|
||||||
if (NOT wxWidgets_FOUND)
|
if (NOT wxWidgets_FOUND)
|
||||||
message(FATAL_ERROR "\nCould not find wxWidgets 3.1.\n"
|
message(FATAL_ERROR "\nCould not find wxWidgets 3.1.\n"
|
||||||
"Hint: On Linux you can set -DSLIC3R_WX_STABLE=1 to use wxWidgets 3.0\n")
|
"Hint: On Linux you can set -DSLIC3R_WX_STABLE=1 to use wxWidgets 3.0\n")
|
||||||
|
@ -91,7 +92,11 @@ endif ()
|
||||||
|
|
||||||
# Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
|
# Add the Slic3r GUI library, libcurl, OpenGL and GLU libraries.
|
||||||
if (SLIC3R_GUI)
|
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 & OpenSSL
|
||||||
find_package(CURL REQUIRED)
|
find_package(CURL REQUIRED)
|
||||||
|
|
Loading…
Reference in a new issue