Commit Graph

123 Commits

Author SHA1 Message Date
bubnikv
fcb04039e8 New shorcut _L() for _(L())
New shorcut _u8L() for _utf8(L())
2020-03-14 17:51:56 +01:00
tamasmeszaros
b6aeffb618 Link libcurl and wxWidgets to libslic3r_gui
Also enhance and remove duplicate CURL search in cmake
2020-03-06 15:16:46 +01:00
bubnikv
7c55674220 Disabled implicit conversion of wxString to std::string or const char*
and vice versa. Fixed one last implicit wxString conversion.
2020-02-27 17:02:08 +01:00
tamasmeszaros
2fb1acd74b Add check for cereal library in CMake
Fixes #3547, replaces #3613
2020-02-07 11:07:22 +01:00
tamasmeszaros
2e039d3955 Fix dll copying 2020-02-06 11:59:02 +01:00
Lukas Matena
63b0eec5a9 Merge branch 'master' into lm_tm_hollowing 2020-01-21 13:00:07 +01:00
tamasmeszaros
a1dc7a5c41 Fix build issues on Windows 2020-01-16 14:25:01 +01:00
bubnikv
19f0f50e98 MSVC specific: Disable STL4007: Many result_type typedefs and
all argument_type, first_argument_type, and second_argument_type
typedefs are deprecated in C++17.

Remove this warning disable after eigen library adapts to the new C++17 adaptor rules.
2020-01-13 16:01:20 +01:00
Lukas Matena
0551411c48 Merge branch 'master' into lm_tm_hollowing 2020-01-06 12:41:29 +01:00
bubnikv
692ed26091 Fix of #3366
Fixed crash due to incorrect localization of the percent sign in
"The %1% infill pattern is not supposed to work at 100%% density."
This happens for ES, FR, IT, UK and ZH_TW localizations.

Also added a new CMake target "gettext_po_to_mo" to convert
all po files to mo files,
and renamed the "pot" target to "gettext_make_pot".
2019-12-22 11:54:23 +01:00
Lukas Matena
b3f15b1c98 Merge branch 'master' into lm_tm_hollowing 2019-12-20 10:33:53 +01:00
tamasmeszaros
c97aacd2d8 Officially move to C++17 for the whole PrusaSlicer source tree; 2019-12-18 11:53:28 +01:00
tamasmeszaros
4e27faa236 Only consider openvdb debug if necessary. Add REQUIRED to openvdb 2019-12-17 16:53:45 +01:00
Lukas Matena
537260494d Merge branch 'master' into lm_tm_hollowing 2019-12-12 11:37:33 +01:00
tamasmeszaros
5b67ce5105 Merge branch 'tm_opencsg' 2019-12-11 12:52:03 +01:00
tamasmeszaros
38aa5cb437 Finding GLEW work in release and debug.
Make building in release and debug in one cmake run on msvc with the prusaslicer_add_cmake_project function.
2019-12-11 12:32:29 +01:00
tamasmeszaros
fc19666fa2 Add dll copy after targets for gmp and mpfr 2019-12-10 17:42:25 +01:00
tamasmeszaros
5e4c4a689c According to cmake, minimum required call shall go before project().
BTW This will make boost config detect the right toolset on every platform.
2019-11-25 10:56:50 +01:00
tamasmeszaros
7011c58faa Merge branch 'master' into lm_tm_hollowing 2019-11-18 17:50:56 +01:00
Enrico Turri
46601f7e1e Added missing boost libraries into CMakeLists.txt 2019-11-12 12:05:13 +01:00
tamasmeszaros
dfa4a58dc6 Bump up C++ to 14 2019-11-12 10:28:00 +01:00
Lukas Matena
7542580ac1 Merge branch 'tm_openvdb_integration' into lm_hollow_gizmo 2019-11-05 11:16:51 +01:00
Vojtech Kral
add2b34d06 build: Fix linking on Mac OS with ASAN on 2019-11-01 10:11:50 +01:00
tamasmeszaros
d63ae1c608 Simple openvdb conversion test. 2019-10-29 16:27:53 +01:00
tamasmeszaros
1cc7bd9976 Fix openvdb dependency in libslic3r 2019-10-25 15:48:01 +02:00
tamasmeszaros
5c0cd06f2f Completely disable openvdb for now 2019-10-25 13:38:18 +02:00
tamasmeszaros
bcc2c21d5f Disable OpenVDB until deps get updated 2019-10-25 13:23:05 +02:00
tamasmeszaros
deda712e20 Merge branch 'tm_openvdb_integration' 2019-10-25 13:16:26 +02:00
tamasmeszaros
4554da29ab Add OpenVDB to dependencies
* Add Linux openvdb integration
* Add Mac openvdb integration and enable in ALL
* Create openvdb sandbox to test integration.
* Additional fixes in the patches
* Remove slabasebed sandbox as it has no relevance now
* Provide FindOpenVDB module and fix build issues
2019-10-25 13:15:21 +02:00
tamasmeszaros
eee20e23e1 Fix RelWithDebInfo build on Linux 2019-10-24 17:32:58 +02:00
tamasmeszaros
d481feda13 Fix for unsupported cmake feature 2019-10-23 16:26:28 +02:00
tamasmeszaros
8961e68f5e another cleanup 2019-10-22 17:04:32 +02:00
tamasmeszaros
7f0c4fafe6 Remove cmake debug messages 2019-10-22 16:42:40 +02:00
tamasmeszaros
9f9a40100f Solve build fail in RelWithDebInfo config with several imported targets. 2019-10-22 16:32:57 +02:00
Lukas Matena
fb7bba2b5a CMakeLists.txt: turning off -W-ignored-attributes, there are loads of those with newer GCC, originating from Eigen (https://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221) 2019-10-17 09:56:38 +02:00
Lukas Matena
605f0ecd54 Revert "CMakeLists.txt: turning off Wno-ignored-attributes on GCC and Clang again"
That change breaks compilation on the old buildserver (gcc 5.4). We'll deal with the warning later somehow.

This reverts commit 50448bf4dd.
2019-10-16 12:53:25 +02:00
Lukas Matena
50448bf4dd CMakeLists.txt: turning off Wno-ignored-attributes on GCC and Clang again
Eigen still produces tons of those warnings on newer gcc
2019-10-15 15:10:52 +02:00
tamasmeszaros
fbc174ad06 Fix cmake with msvc generator.
* Remove unused libnest2d files. Make it use the global build script targets.
* Modify FindTBB to address multi-config builds and take care of __TBB_NO_IMPLICIT_LINKAGE
* Move FindNLopt to project common cmake module dir
* Rename libnest.hpp to nester.hpp and libnest.h to libnest.hpp 
* Clean up common test suite build scripts
2019-10-14 12:50:08 +02:00
tamasmeszaros
d5dcba00b1 Time conversion functions with tests.
Fixes issue with incorrect characters in time strings on UI.
Fix platform dependency


Fix return value with incorrect strings.


Just use strptime and strftime on all platforms.

Emulate strptime on msvc... because they don't have it and their get_time is buggy.
2019-10-02 14:44:11 +02:00
Vojtech Kral
bc6bb85d65
Merge pull request #2646 from labsin/no_FHS_build
Only set SLIC3R_FHS_RESOURCES when SLIC3R_FHS is set
2019-09-02 12:16:15 +02:00
bubnikv
8865c4b685 Plurals for number of Undo / Redo actions. 2019-08-28 16:19:46 +02:00
bubnikv
cd35fd9b34 Refreshed the dictionaries.
Introduced a new localization macro L_CONTEXT(string, context)
to define context dependent translations.

The only strings - "Top" and "Bottom" were already using context, but
until now the context had to be added to the PrusaSlicer.pot file
manually, while the context is being generated automatically now.
2019-08-27 17:14:03 +02:00
tamasmeszaros
7e0199746e more clang warnings enabled, performance measuring
Succesfull build on mingw-w64


fix sandboxes


Mingw fixes and full parallel support tree gen.
2019-08-16 16:17:37 +02:00
tamasmeszaros
7d25d8c677 Can build with (original llvm) clang-cl on windows 2019-08-01 16:03:52 +02:00
Vojtech Kral
26c2b16f61 Build: Remove SLIC3R_SYNTAXONLY 2019-07-26 14:27:37 +02:00
Lukas Matena
0a5f8aa2e8 An attempt to silence the Wreorder warning on OSX build server
Clang apparently cares about order of command line arguments, so -Wall should come before -Wno-whatever
2019-07-23 15:13:47 +02:00
Lukas Matena
91a5d70a62 Fixed a few warnings in headers (meaning they were reported once for each include)
Fixed an identification of CXX compiler in cmake so that 'AppleClang' is recognized
2019-07-23 14:02:20 +02:00
Yuri D'Elia
77c3d2fbb3 Use system Eigen3 on linux when found 2019-07-22 14:53:51 +02:00
Sam Segers
b5ff4bbb52 Only set SLIC3R_FHS_RESOURCES when SLIC3R_FHS is set
This makes it possible to run slic3r in a temporary direction
with

  make DESTDIR="run" install
2019-07-16 23:12:07 +02:00
Lukas Matena
004e2719b1 Merge branch 'master' into lm_warnings 2019-07-15 13:26:55 +02:00