Commit Graph
5 Commits
Author SHA1 Message Date
Dzmitry Neviadomski 242ad33eb4 chore(slicer): Update copyright year to 2024 (#4428)
Also remove duplicated definition for `MACOSX_BUNDLE_COPYRIGHT`.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>
2024-03-13 21:20:39 +08:00
Dzmitry Neviadomski 94eb020459 ENH: Switch wxWidgets dep to a shallow git clone. (#4369)
ENH: Switch wxWidgets dep to a shallow git clone.

wxWidgets repo is pretty large, so initial clone can take
a lot of time and disk space.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>
2024-03-11 19:54:46 +08:00
Dzmitry Neviadomski 6264fe64b4 FIX: Support building with latest Xcode 15.3 (#4367)
* FIX: Support building with latest Xcode 15.3

Downgrade 'enum-constexpr-conversion' error to warning.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

* FIX: Do not assume libdeflate is not installed on the system

Explicitly disable libdeflate support in TIFF depencency.
PrusaSlicer already does that.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

* FIX: Downgrade enum-constexpr-conversion warning only on AppleClang 15+

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

---------

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>
2024-03-08 23:40:23 +08:00
Dzmitry Neviadomski e787cd5315 FIX: revert default CMake generator for deps on macOS (#4357)
* FIX: revert default CMake generator for deps on macOS

Before I wrongfully assumed that default CMake generator for both deps
and slicer is Xcode.
This is not true, as deps used implicitly-defaulted Unix Makefiles.
Fix by separating generator used for Slicer and deps, leaving the
choice to use Ninja for both.
Right now Xcode generator is not supported for deps and must be fixed
separately.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

* FIX: Use ALL_BUILD target when building slicer with Xcode generator

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

* FIX: Adjust .app searching subdir for Xcode generator

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

---------

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>
2024-03-07 22:39:18 +08:00
Dzmitry Neviadomski 7b31ee3a45 ENH: Improve macOS build script (#4310)
* ENH: Improve macOS build script

 - Update shebang to bash, as it is already expected to be present in
   run_gettext.sh
 - Added fail-fast shell options.
 - Changed default CMake generator to Ninja
 - Adopted configuration for non-multi-config generators (Ninja, Make)
 - Added new options:
   - Allow to set CMake generator back to Xcode, no option for make
     thou.
   - Allow to build without reconfiguring CMake, improves build times.
     Unnecessary Cmake reconfigurations require full rebuild.
   - Allow to set build configuration for CMake
 - Reorganized targets into separate function to break "cd" dependency.
 - Reformat shell code.
 - Fix all warnings reported by ShellCheck linter tool.
 - Update run_gettext.sh to respect build dir in full mode.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

* FIX: Install ninja with brew on CI.

Test if building works with Ninja by default.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

* ENH: Set Xcode back as default generator.

Use Ninja on CI with explicit option.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

* FIX: Partially revent changes in run_gettext.sh

Revert changes for option parsing.
Leave fixes for issues found by ShellCheck linter tool.

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>

---------

Signed-off-by: Dzmitry Neviadomski <nevack.d@gmail.com>
2024-03-05 22:35:46 +08:00