[i490d] CI: as Hugo does not support symlinks, build figure in old location ()

Merging branch 'i490d'  into 'main'.

See merge request !1383

.gitignore

@@ -35,3 +35,4 @@ cover/
 
 hugo/public
 hugo/resources
+hugo/static/img/auto
\ No newline at end of file

.gitlab-ci.yml

@@ -6,7 +6,7 @@ native_Debian_clang:
   - Debian
   before_script: &debian_clang
     - pwd
-    - export CC=clang; export CXX=clang++
+    - export CC=gcc; export CXX=g++
     - export QCMAKE=/home/build/Qt/6.2.3/gcc_64/lib/cmake
     - export PYTHONPATH=$CI_PROJECT_DIR/build/lib
     - export MPLBACKEND=Agg
@@ -16,7 +16,7 @@ native_Debian_clang:
   script: &native_scr
     - mkdir build
     - cd build
-    - time cmake .. -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON -DCMAKE_PREFIX_PATH=$QCMAKE #-DWERROR=ON
+    - time cmake .. -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON -DCMAKE_PREFIX_PATH=$QCMAKE -DZERO_TOLERANCE=ON
     - time make -j32
     - time xvfb-run -a ctest -j16 --output-on-failure
     - time make package_source

3rdparty/GUI/qcustomplot/CMakeLists.txt

@@ -17,7 +17,8 @@ set(${library_name}_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
 set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
 
 if(NOT WIN32)
-    target_compile_options(${library_name} PRIVATE -Wno-deprecated-declarations)
+    target_compile_options(${library_name}
+        PRIVATE -Wno-deprecated-declarations -Wno-implicit-fallthrough)
 endif()
 
 target_link_libraries(${library_name}

Fit/3rdparty/RootMinimizers/CMakeLists.txt

@@ -18,7 +18,7 @@ file(GLOB source_files
 add_definitions(-DWARNINGMSG)
 string(APPEND CMAKE_CXX_FLAGS " -DMATH_NO_PLUGIN_MANAGER -DHAS_MINUIT2 -DR__HAS_MATHMORE")
 if(NOT WIN32)
-    string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations")
+    string(APPEND CMAKE_CXX_FLAGS " -Wno-deprecated-declarations -Wno-unused-but-set-variable")
     # suppresses a warning in
     # Fit/3rdparty/RootMinimizers/mathcore/Math/GSLRngROOTWrapper.h
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang"

GUI/Model/Device/BeamItems.h

@@ -95,7 +95,6 @@ public:
 private:
     SelectionProperty<FootprintItemCatalog> m_footprint;
     bool m_expandFootprint = true;
-    double m_wavelength = 0;
 };
 
 class GISASBeamItem : public BeamItem {

GUI/Model/Device/InstrumentItems.cpp

@@ -769,8 +769,8 @@ const ICoordSystem* OffspecInstrumentItem::createCoordSystem() const
         new FixedBinAxis("alpha", m_alphaAxis.nbins(), m_alphaAxis.min() * Units::deg,
                          m_alphaAxis.max() * Units::deg);
 
-    const auto* det =
-        dynamic_cast<const SphericalDetector*>(detectorItem()->createDetector().get());
+    auto d = detectorItem()->createDetector();
+    const auto* det = dynamic_cast<const SphericalDetector*>(d.get());
     ASSERT(det);
     return det->offspecCoords(alphaAxis);
 }

Tests/Examples/CMakeLists.txt

@@ -4,15 +4,15 @@
 
 file(MAKE_DIRECTORY ${TEST_OUTPUT_DIR_PY_PERSIST})
 
-set(FIG_DIR ${CMAKE_BINARY_DIR}/img)
+set(FIG_DIR ${CMAKE_SOURCE_DIR}/hugo/static/img/auto)
 
 add_custom_target(figures)
 add_custom_target(manualtest)
 
-file(MAKE_DIRECTORY ${FIG_DIR}/auto)
+file(MAKE_DIRECTORY ${FIG_DIR})
 foreach(subdir scatter2d ff fq specular varia)
     file(MAKE_DIRECTORY ${TEST_OUTPUT_DIR_PY_PERSIST}/${subdir})
-    file(MAKE_DIRECTORY ${FIG_DIR}/auto/${subdir})
+    file(MAKE_DIRECTORY ${FIG_DIR}/${subdir})
 endforeach()
 
 ####################################################################################################
@@ -39,7 +39,7 @@ function(run_example example)
         BA_EXAMPLE_DATA_DIR=${EXAMPLES_DIR}/data
         PYTHONPATH=${CMAKE_BINARY_DIR}/lib
         ${Python3_EXECUTABLE} ${EXAMPLE_SCRIPT}
-           figfile=${FIG_DIR}/auto/${EXAMPLE_SUBDIR}/${EXAMPLE_NAME}.png)
+           figfile=${FIG_DIR}/${EXAMPLE_SUBDIR}/${EXAMPLE_NAME}.png)
     add_dependencies(figures ${TARGET_NAME})
 endfunction()
 
@@ -90,7 +90,7 @@ function(test_equality example reference tolerance nsim)
         PYTHONPATH=${CMAKE_BINARY_DIR}/lib
         BA_EXAMPLE_DATA_DIR=${EXAMPLES_DIR}/data
         ${Python3_EXECUTABLE} ${EXAMPLE_SCRIPT}
-          figfile=${FIG_DIR}/auto/${EXAMPLE_SUBDIR}/${EXAMPLE_NAME}.png)
+          figfile=${FIG_DIR}/${EXAMPLE_SUBDIR}/${EXAMPLE_NAME}.png)
     add_dependencies(figures ${TARGET_NAME})
 endfunction()
 

hugo/static/img/auto

-../../../build/img
\ No newline at end of file