Merge branch 'master' into lm_warnings

This commit is contained in:
Lukas Matena 2019-07-15 13:26:55 +02:00
commit 004e2719b1
172 changed files with 9118 additions and 4980 deletions

View file

@ -355,6 +355,10 @@ if (NOT GLEW_FOUND)
endif ()
include_directories(${GLEW_INCLUDE_DIRS})
# Find the Cereal serialization library
add_library(cereal INTERFACE)
target_include_directories(cereal INTERFACE include)
# l10n
set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
add_custom_target(pot