Merge branch 'main' into fem_test_partial_fix

.github/ISSUE_TEMPLATE/PROBLEM_REPORT.yml

@@ -41,6 +41,7 @@ body:
         - FEM
         - File formats
         - GCS
+        - Mesh
         - OpenSCAD
         - Part
         - PartDesign

.github/labels.yml

@@ -3,67 +3,85 @@
 # - any: ['src/**/*', '!src/docs/*']
 
 Core:
-- 'src/App/**/*'
-- 'src/Base/**/*'
-- 'src/Gui/**/*'
+- changed-files:
+  - any-glob-to-any-file: ['src/App/**/*', 'src/Base/**/*', 'src/Gui/**/*']
 
 :octocat::
-- '.github/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['.github/**/*']
 
 Addon Manager:
-- 'src/Mod/AddonManager/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/AddonManager/**/*']
 
 Materials:
-- 'src/Mod/Material/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Material/**/*']
 
 WB Arch:
-- 'src/Mod/Arch/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Arch/**/*']
 
 WB Assembly:
-- 'src/Mod/Assembly/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Assembly/**/*']
 
 WB Draft:
-- 'src/Mod/Draft/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Draft/**/*']
 
 WB FEM:
-- 'src/Mod/Fem/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Fem/**/*']
 
 WB Mesh:
-- 'src/Mod/Mesh/**/*'
+- changed-files:
+  - any-glob-to-any-file: ['src/Mod/Mesh/**/*']
 
 WB MeshPart:
-- 'src/Mod/MeshPart/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/MeshPart/**/*']
 
 WB OpenSCAD:
-- 'src/Mod/OpenSCAD/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/OpenSCAD/**/*']
 
 WB Part:
-- 'src/Mod/Part/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Part/**/*']
 
 WB Part Design:
-- 'src/Mod/PartDesign/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/PartDesign/**/*']
 
 WB CAM:
-- 'src/Mod/CAM/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/CAM/**/*']
 
 WB Points:
-- 'src/Mod/Points/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Points/**/*']
 
 WB ReverseEngineering:
-- 'src/Mod/ReverseEngineering/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/ReverseEngineering/**/*']
 
 WB Sketcher:
-- 'src/Mod/Sketcher/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Sketcher/**/*']
 
 WB Spreadsheet:
-- 'src/Mod/Spreadsheet/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Spreadsheet/**/*']
 
 WB Surface:
-- 'src/Mod/Surface/**/*/'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Surface/**/*/']
 
 WB TechDraw:
-- 'src/Mod/TechDraw/**/*'
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/TechDraw/**/*']
 
 WB Test:
-- 'src/Mod/Test/**/*'
-
+- changed-files:
+  - any-glob-to-any-file:  ['src/Mod/Test/**/*']

.github/workflows/CI_master.yml

@@ -39,18 +39,17 @@ jobs:
     with:
       artifactBasename: Prepare-${{ github.run_id }}
 
-  # GA in Jan-Mar 2024 Timeframe: https://github.com/actions/runner-images/issues/8439#issuecomment-1755601587
-  # MacOS_13_Conda_Apple:
-  #   needs: [Prepare]
-  #   uses: ./.github/workflows/sub_buildMacOSCondaApple.yml
-  #   with:
-  #     artifactBasename: MacOS_13_Conda_Apple-${{ github.run_id }}
-
-  MacOS_13_Conda_Intel:
+  MacOS_13_Conda_Apple:
     needs: [Prepare]
-    uses: ./.github/workflows/sub_buildMacOSCondaIntel.yml
+    uses: ./.github/workflows/sub_buildMacOSCondaApple.yml
     with:
-      artifactBasename: MacOS_13_Conda_Intel-${{ github.run_id }}
+      artifactBasename: MacOS_13_Conda_Apple-${{ github.run_id }}
+
+#  MacOS_13_Conda_Intel:
+#    needs: [Prepare]
+#    uses: ./.github/workflows/sub_buildMacOSCondaIntel.yml
+#    with:
+#      artifactBasename: MacOS_13_Conda_Intel-${{ github.run_id }}
 
   Ubuntu_20-04:
     needs: [Prepare]
@@ -88,8 +87,8 @@ jobs:
   WrapUp:
     needs: [
         Prepare,
-        # MacOS_13_Conda_Apple,
-        MacOS_13_Conda_Intel,
+        MacOS_13_Conda_Apple,
+        # MacOS_13_Conda_Intel,
         Ubuntu_20-04,
         Ubuntu_22-04_Conda,
         Windows,

.github/workflows/sub_buildMacOSCondaApple.yml

@@ -45,7 +45,7 @@ on:
 
 jobs:
   Build:
-    runs-on: macos-13-xlarge
+    runs-on: macos-14
     continue-on-error: ${{ inputs.allowedToFail }}
     env:
       CCACHE_DIR: ${{ github.workspace }}/ccache
@@ -72,6 +72,8 @@ jobs:
         with:
           submodules: true
       - name: Setup Miniconda
+        env:
+          CONDA_VERBOSITY: 2
         uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
@@ -80,6 +82,8 @@ jobs:
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies
+        env:
+          CONDA_VERBOSITY: 2
         run: |
           ./conda/setup-environment.sh
       - name: Set Environment Variables

.github/workflows/sub_buildMacOSCondaIntel.yml

@@ -72,6 +72,8 @@ jobs:
         with:
           submodules: true
       - name: Setup Miniconda
+        env:
+          CONDA_VERBOSITY: 2
         uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
@@ -80,6 +82,8 @@ jobs:
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies
+        env:
+          CONDA_VERBOSITY: 2
         run: |
           ./conda/setup-environment.sh
       - name: Set Environment Variables

.github/workflows/sub_buildUbuntu2204Conda.yml

@@ -70,6 +70,8 @@ jobs:
         with:
           submodules: true
       - name: Setup Miniconda
+        env:
+          CONDA_VERBOSITY: 2
         uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
@@ -78,6 +80,8 @@ jobs:
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies
+        env:
+          CONDA_VERBOSITY: 2
         run: |
           ./conda/setup-environment.sh
       - name: Set Environment Variables

.github/workflows/sub_buildWindowsConda.yml

@@ -65,6 +65,8 @@ jobs:
         with:
           submodules: true
       - name: Setup Miniconda
+        env:
+          CONDA_VERBOSITY: 2
         uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: .conda/freecad
@@ -73,6 +75,8 @@ jobs:
           channel-priority: true
           miniforge-version: latest
       - name: Install FreeCAD dependencies
+        env:
+          CONDA_VERBOSITY: 2
         run: |
           conda config --add envs_dirs $PWD/.conda
           mamba-devenv -f conda/environment.devenv.yml

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -138,6 +138,11 @@ macro(InitializeFreeCADBuildOptions)
     option(BUILD_CLOUD "Build the FreeCAD cloud module" OFF)
     option(ENABLE_DEVELOPER_TESTS "Build the FreeCAD unit tests suit" ON)
 
+    if(MSVC)
+        set(FREECAD_3CONNEXION_SUPPORT "NavLib" CACHE STRING "Select version of the 3Dconnexion device integration")
+        set_property(CACHE FREECAD_3CONNEXION_SUPPORT PROPERTY STRINGS "NavLib" "SpNav")
+    endif(MSVC)
+
     if(MSVC)
         option(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)
         option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF) # 3/5/2021 current LibPack uses non-C++17 FLANN
@@ -157,6 +162,11 @@ macro(InitializeFreeCADBuildOptions)
         option(FREECAD_USE_PCL "Build the features that use PCL libs" OFF)
     endif(NOT MSVC)
 
+    if(FREECAD_3CONNEXION_SUPPORT STREQUAL "NavLib" AND FREECAD_USE_3DCONNEXION)
+        set(FREECAD_USE_3DCONNEXION_NAVLIB ON)
+        set(FREECAD_USE_3DCONNEXION OFF)
+    endif()
+
     # if this is set override some options
     if (FREECAD_BUILD_DEBIAN)
         set(FREECAD_USE_EXTERNAL_ZIPIOS ON )

cMake/FreeCAD_Helpers/PrintFinalReport.cmake

@@ -166,7 +166,13 @@ macro(PrintFinalReport)
     simple(Coin3D "${COIN3D_VERSION} [${COIN3D_LIBRARIES}] [${COIN3D_INCLUDE_DIRS}]")
     simple(pivy ${PIVY_VERSION})
     if (WIN32)
-        #simple(SPNAV "not available yet for your OS") # FREECAD_USE_3DCONNEXION instead...
+        if (FREECAD_USE_3DCONNEXION)
+            simple(3Dconnexion "Building 3Dconnexion support with original code")
+        elseif(FREECAD_USE_3DCONNEXION_NAVLIB)
+            simple(3Dconnexion "Building 3Dconnexion support with NavLib")
+        else()
+            simple(3Dconnexion "Not building 3Dconnexion device support")
+        endif()
     else()
         conditional(SPNAV SPNAV_FOUND "not found" "[${SPNAV_LIBRARY}] [${SPNAV_INCLUDE_DIR}]")
     endif()

data/examples/CMakeLists.txt

@@ -18,7 +18,7 @@ ADD_CUSTOM_TARGET(Example_data ALL
 
 # 0001097: CMake stops with error "Circular ... <- ... dependency dropped."
 if(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-    fc_copy_sources(Example_data "${CMAKE_BINARY_DIR}/data/examples" ${Examples_Files})
+    fc_copy_sources(Example_data "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/examples" ${Examples_Files})
 endif()
 
 if (WIN32 AND FREECAD_LIBPACK_USE)

src/3rdParty/3Dconnexion/README.txt

@@ -0,0 +1,3 @@
+This directory contains part of the the 3Dconnexion 3DxWare_SDK v4
+The full sdk can be obtained from https://3dconnexion.com/software-developer-program/
+