Commit Graph

25 Commits

Author SHA1 Message Date
Dzmitry Neviadomski
2964fd5c51 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
58773c026e 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
kpishere
beb7511d6b Feature/build target 10.15 (#3252)
* Set target to 10.15, make porter templates explicit

* CMAKE_OSX_DEPLOYMENT_TARGET refactor

* Update build_release_macos.sh

fix typo

---------

Co-authored-by: SoftFever <softfeverever@gmail.com>
2023-12-30 09:12:06 +08:00
SoftFever
1983ce5e9b upgrade to macos 13 (#3289)
brew uninstall --ignore-dependencies zstd
Use local curl
remove brew/macport dependency
2023-12-27 17:01:12 +08:00
SoftFever
1ca897c958 upgrade deps (#2349)
* upgrade deps
2023-10-09 00:19:26 +08:00
SoftFever
174bb86c98 fix Mac build script 2023-09-09 11:04:45 +08:00
SoftFever
2060606235 Life saver: update locale generation 2023-09-05 22:36:29 +08:00
SoftFever
ac3098fcfb don't force build debug version of boost on Windows 2023-08-10 10:56:12 +08:00
SoftFever
ba0efd4df7 DummyPR (#1698)
* upload deps binaries
2023-08-06 18:24:49 +08:00
SoftFever
23878370ac clean up Mac 2023-03-16 20:50:23 +08:00
SoftFever
7da585357b CICD: was uploading wrong zip file 2023-03-16 01:29:29 +08:00
SoftFever
83a4adb327 sign mac app 2023-03-15 23:51:42 +08:00
SoftFever
a8d3e161b4 Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
b517713a4b OrcaSlicer 2023-03-10 18:58:43 +08:00
SoftFever
0088fa1867 minor changes 2023-03-10 18:35:57 +08:00
Jordan Hubbard
331c012c0a Make this work with either brew or macports and emit diagnostic when (#419)
neither is found rather than just blowing up.
2023-03-04 15:07:01 +08:00
SoftFever
2df3c15c7a delete .DS_Store 2023-01-14 11:57:59 +08:00
SoftFever
dba0151c70 CICD (#167)
CICD
2023-01-12 22:55:50 +08:00
SoftFever
461120b4c3 streamline mac build script
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-01 12:27:48 +08:00
SoftFever
f6916fb767 generate Xcode project instead
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-30 14:19:37 +08:00
GiaPag
73e44c3098 Fixed deps "directory not found" (#23) 2022-12-13 11:48:52 +08:00
SoftFever
da24d86f5c fix crash when there are unicode string in the model path 2022-10-26 21:23:51 +08:00
SoftFever
138984b203 update mac build script 2022-10-22 01:07:32 +08:00
SoftFever
6dfe4f2a63 fix mac osx build script when ninja is installed 2022-10-09 21:55:54 +08:00
SoftFever
3f6e5529fc macos build script 2022-09-30 16:18:24 +08:00