Merge branch 'develop'

d3858cb1 · Wuttke, Joachim · f537a000 · 8b7500df · d3858cb1 · d3858cb1
Commit d3858cb1 authored 4 years ago by Wuttke, Joachim
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,8 @@ mac:
  script:
    - mkdir build
    - cd build
-    - cmake .. -D CMAKE_PREFIX_PATH=/usr/local/opt/qt -D CMAKE_CXX_COMPILER_LAUNCHER=ccache
+    - export QTDIR=/usr/local/opt/qt5
+    - cmake .. -D CMAKE_PREFIX_PATH=$QTDIR -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DBORNAGAIN_APPLE_BUNDLE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15
    - make -j2
    - ctest --output-on-failure
    - cpack . -V

--- a/ThirdParty/Core/CMakeLists.txt
+++ b/ThirdParty/Core/CMakeLists.txt
--- a/ThirdParty/Core/cerfcpp.h
+++ b/ThirdParty/Core/cerfcpp.h
--- a/ThirdParty/Core/tspectrum/CMakeLists.txt
+++ b/ThirdParty/Core/tspectrum/CMakeLists.txt
--- a/ThirdParty/Core/tspectrum/README.md
+++ b/ThirdParty/Core/tspectrum/README.md
--- a/ThirdParty/Core/tspectrum/TSpectrum2.cxx
+++ b/ThirdParty/Core/tspectrum/TSpectrum2.cxx
--- a/ThirdParty/Core/tspectrum/TSpectrum2.h
+++ b/ThirdParty/Core/tspectrum/TSpectrum2.h
--- a/ThirdParty/Core/tspectrum/spectrum_types.h
+++ b/ThirdParty/Core/tspectrum/spectrum_types.h
--- a/ThirdParty/Core/tspectrum/tspectrum.cxx
+++ b/ThirdParty/Core/tspectrum/tspectrum.cxx
--- a/ThirdParty/Core/tspectrum/tspectrum.h
+++ b/ThirdParty/Core/tspectrum/tspectrum.h
--- a/ThirdParty/GUI/qcustomplot/CMakeLists.txt
+++ b/ThirdParty/GUI/qcustomplot/CMakeLists.txt
--- a/ThirdParty/GUI/qcustomplot/GPL.txt
+++ b/ThirdParty/GUI/qcustomplot/GPL.txt
--- a/ThirdParty/GUI/qcustomplot/changelog.txt
+++ b/ThirdParty/GUI/qcustomplot/changelog.txt
--- a/ThirdParty/GUI/qcustomplot/qcustomplot.cpp
+++ b/ThirdParty/GUI/qcustomplot/qcustomplot.cpp
--- a/ThirdParty/GUI/qcustomplot/qcustomplot.h
+++ b/ThirdParty/GUI/qcustomplot/qcustomplot.h
--- a/ThirdParty/common/CMakeLists.txt
+++ b/ThirdParty/common/CMakeLists.txt
--- a/ThirdParty/common/gtest/00_PROVENANCE
+++ b/ThirdParty/common/gtest/00_PROVENANCE
--- a/ThirdParty/common/gtest/CMakeLists.txt
+++ b/ThirdParty/common/gtest/CMakeLists.txt
--- a/ThirdParty/common/gtest/gtest-1.10.0/.clang-format
+++ b/ThirdParty/common/gtest/gtest-1.10.0/.clang-format
--- a/ThirdParty/common/gtest/gtest-1.10.0/.gitignore
+++ b/ThirdParty/common/gtest/gtest-1.10.0/.gitignore