Merge branch 'task/ci-improve' into develop

.github/workflows/ci_linux_arm.yml

@@ -41,7 +41,7 @@ jobs:
                       apt-get -y install qtbase5-dev libqt5svg5-dev
                       apt-get -y install libxcb-cursor0  # Dependencies for "xcb" Qt plugin(actually needed for Qt6)
                       apt-get -y install libocct-data-exchange-dev libocct-draw-dev occt-misc
-                      apt-get -y install libtbb2-dev libxi-dev  # Dependencies for OpenCascade v7.5
+                      apt-get -y install libtbb-dev libxi-dev  # Dependencies for OpenCascade
                       apt-get -y install libassimp-dev
                       ;;
                   fedora*)

.github/workflows/ci_macos.yml

@@ -11,18 +11,13 @@ jobs:
           uses: actions/checkout@v2
 
         - name: Install Qt
-          uses: jurplel/install-qt-action@v3
-          with:
-              cache: true
-              cache-key-prefix: QtCache
+          run: brew install qt@5
 
         - name: Install OpenCascade
-          run: |
-              brew install opencascade
+          run: brew install opencascade
 
         - name: Install Assimp
-          run: |
-              brew install assimp
+          run: brew install assimp
 
         - name: Get count of CPU cores
           uses: SimenB/github-actions-cpu-cores@v1
@@ -35,7 +30,8 @@ jobs:
               cmake --version
               cmake .. \
                     -DMayo_BuildTests=ON \
-                    -DMayo_BuildPluginAssimp=ON
+                    -DMayo_BuildPluginAssimp=ON \
+                    -DQT_DIR=$(brew --prefix qt5)/lib/cmake/Qt5
               cmake --build . \
                     --config Release \
                     --parallel ${{steps.cpu-cores.outputs.count}}

.github/workflows/ci_windows.yml

@@ -83,6 +83,7 @@ jobs:
               cmake .. ^
                     -DMayo_BuildTests=ON ^
                     -DMayo_BuildPluginAssimp=ON ^
+                    -DMayo_PostBuildCopyRuntimeDLLs=ON ^
                     -DOpenCASCADE_DIR=../OpenCASCADE-${{matrix.occ_version}}-vc14-64/opencascade-${{matrix.occ_version}} ^
                     -Dassimp_DIR=${{github.workspace}}/assimp-5.3.1/lib/cmake/assimp-5.3
               cmake --build . ^
@@ -93,7 +94,5 @@ jobs:
           working-directory: ${{github.workspace}}/build
           shell: cmd
           run: |
-              call ..\OpenCASCADE-${{matrix.occ_version}}-vc14-64\opencascade-${{matrix.occ_version}}\env.bat
-              set PATH=${{github.workspace}}\assimp-5.3.1\bin;%PATH%
               release\mayo.exe --runtests -o utests-output.txt
               more utests-output.txt

CMakeLists.txt

@@ -300,10 +300,16 @@ endif()
 if(OpenCASCADE_FOUND)
     message(STATUS "OpenCascade version ${OpenCASCADE_VERSION}")
 
-    # Silent warnings C4996 and STL4015: the std::iterator class template(used as a base class to
-    # provide typedefs) is deprecated in C++17
-    if(MSVC AND OpenCASCADE_VERSION VERSION_LESS 7.7.0)
-        list(APPEND Mayo_CompileDefinitions _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
+    # std::iterator class template(used as a base class to provide typedefs) is deprecated in C++17
+    # OpenCascade < 7.7.0 uses std::iterator for NCollection_StlIterator and this is causing many
+    # deprecation warnings
+    if(OpenCASCADE_VERSION VERSION_LESS 7.7.0)
+        if(MSVC)
+            # Silent warnings C4996 and STL4015
+            list(APPEND Mayo_CompileDefinitions _SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING)
+        elseif((CMAKE_CXX_COMPILER_ID MATCHES "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 12))
+            list(APPEND Mayo_CompileOptions -Wno-deprecated-declarations)
+        endif()
     endif()
 
     # Add OpenCASCADE libraries

src/3rdparty/commit_magic_enum.txt

@@ -1 +1 @@
-caa2f9e6ef882671bc8be84dd98a225ad12d62bf
+ec11ae0c285773e691a1e8372e4984189a6bed1e