Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

BornAgain
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

be2cb3b3

Commit be2cb3b3 authored 1 year ago by Wuttke, Joachim

Downloads
- Plain Diff

Merge branch 'j.21to22' into j.from21

parents d69214f0 5b3ef78b

No related branches found

No related tags found

1 merge request!2050rebase main on r21/v21.1

Pipeline #115614 passed 1 year ago

Stage: build

Changes 11
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
App/CMakeLists.txt 10 additions, 6 deletions

App/CMakeLists.txt
CHANGELOG 20 additions, 1 deletion

CHANGELOG
GUI/CMakeLists.txt 4 additions, 0 deletions

GUI/CMakeLists.txt
cmake/BornAgain/MakeLib.cmake 4 additions, 0 deletions

cmake/BornAgain/MakeLib.cmake
cmake/configurables/FixPack.cmake.in 2 additions, 1 deletion

cmake/configurables/FixPack.cmake.in
cmake/multipython/MakePythonWheel.cmake 6 additions, 2 deletions

cmake/multipython/MakePythonWheel.cmake
devtools/deploy/mac/adjust_mac_bundle.zsh.in 0 additions, 350 deletions

devtools/deploy/mac/adjust_mac_bundle.zsh.in
devtools/deploy/mac/mac_package.py.in 903 additions, 0 deletions

devtools/deploy/mac/mac_package.py.in
devtools/deploy/mac/mk_pypack_macos.zsh.in 8 additions, 53 deletions

devtools/deploy/mac/mk_pypack_macos.zsh.in
devtools/deploy/mac/shutils.zsh 20 additions, 0 deletions

devtools/deploy/mac/shutils.zsh

with 978 additions and 414 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment