diff options
| author | Lukas Matena <lukasmatena@seznam.cz> | 2019-12-12 13:37:33 +0300 |
|---|---|---|
| committer | Lukas Matena <lukasmatena@seznam.cz> | 2019-12-12 13:37:33 +0300 |
| commit | 537260494df5736b5a36677b86cf04c364fbf831 (patch) | |
| tree | 838db423c8bc7f4d3594267398c6ad2b2c591d89 /src/slic3r/CMakeLists.txt | |
| parent | 135660decfd2cdb6d8b26059c05fa084e399bff2 (diff) | |
| parent | c284a65caaa6d859164c33f858512d7d8d3d0f5c (diff) | |
Merge branch 'master' into lm_tm_hollowing
Diffstat (limited to 'src/slic3r/CMakeLists.txt')
| -rw-r--r-- | src/slic3r/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index 6368388c4..859c17e89 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -1,5 +1,5 @@ +cmake_minimum_required(VERSION 3.8) project(libslic3r_gui) -cmake_minimum_required(VERSION 2.6) include(PrecompiledHeader) @@ -107,6 +107,8 @@ set(SLIC3R_GUI_SOURCES GUI/Camera.hpp GUI/wxExtensions.cpp GUI/wxExtensions.hpp + GUI/ExtruderSequenceDialog.cpp + GUI/ExtruderSequenceDialog.hpp GUI/WipeTowerDialog.cpp GUI/WipeTowerDialog.hpp GUI/RammingChart.cpp @@ -138,6 +140,8 @@ set(SLIC3R_GUI_SOURCES GUI/ProgressStatusBar.cpp GUI/PrintHostDialogs.cpp GUI/PrintHostDialogs.hpp + GUI/Mouse3DController.cpp + GUI/Mouse3DController.hpp Utils/Http.cpp Utils/Http.hpp Utils/FixModelByWin10.cpp @@ -172,7 +176,7 @@ add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES}) encoding_check(libslic3r_gui) -target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui ${GLEW_LIBRARIES}) +target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL OpenGL::GLU hidapi) if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY) add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE) endif () |