diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2021-12-17 13:47:21 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2021-12-17 13:47:21 +0300 |
| commit | 49b41628aadb2f2888f6f0f5f046f06df6257639 (patch) | |
| tree | 125c96ff3c0fac19d7efe65097e1ec0bfa04eb84 /src | |
| parent | f7513b61e7032567b02b3e459c6538a70a29b0b3 (diff) | |
| parent | a16c89b5a80f27750777b65fb9ace28bccfdd51b (diff) | |
Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/libslic3r/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/slic3r/CMakeLists.txt | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index deaa0b924..97d1d5ce5 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -14,7 +14,7 @@ if (TARGET OpenVDB::openvdb) set(OpenVDBUtils_SOURCES OpenVDBUtils.cpp OpenVDBUtils.hpp) endif() -add_library(libslic3r STATIC +set(SLIC3R_SOURCES pchheader.cpp pchheader.hpp BoundingBox.cpp @@ -291,6 +291,14 @@ add_library(libslic3r STATIC SLA/ReprojectPointsOnMesh.hpp ) +add_library(libslic3r STATIC ${SLIC3R_SOURCES}) + +foreach(_source IN ITEMS ${SLIC3R_SOURCES}) + get_filename_component(_source_path "${_source}" PATH) + string(REPLACE "/" "\\" _group_path "${_source_path}") + source_group("${_group_path}" FILES "${_source}") +endforeach() + if (SLIC3R_STATIC) set(CGAL_Boost_USE_STATIC_LIBS ON CACHE BOOL "" FORCE) endif () diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt index 34cc98051..211a2c2e7 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt @@ -258,6 +258,12 @@ endif () add_library(libslic3r_gui STATIC ${SLIC3R_GUI_SOURCES}) +foreach(_source IN ITEMS ${SLIC3R_GUI_SOURCES}) + get_filename_component(_source_path "${_source}" PATH) + string(REPLACE "/" "\\" _group_path "${_source_path}") + source_group("${_group_path}" FILES "${_source}") +endforeach() + encoding_check(libslic3r_gui) target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES}) |