Merge branch 'FreeCAD:master' into master

CMakeLists.txt

@@ -10,9 +10,17 @@ if (POLICY CMP0072)
  set(OpenGL_GL_PREFERENCE LEGACY)
 endif(POLICY CMP0072)
 
-find_program(CCACHE_PROGRAM ccache) #This check should occur before project()
-if(CCACHE_PROGRAM)
- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+if (BUILD_WITH_CONDA AND WIN32)
+ option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" OFF)
+else()
+ option(FREECAD_USE_CCACHE "Auto detect and use ccache during compilation" ON)
+endif()
+
+if(FREECAD_USE_CCACHE)
+ find_program(CCACHE_PROGRAM ccache) #This check should occur before project()
+ if(CCACHE_PROGRAM)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
+ endif()
 endif()
 
 project(FreeCAD)
@@ -97,7 +105,7 @@ if(MSVC AND FREECAD_LIBPACK_USE AND LIBPACK_FOUND)
  CopyLibpackDirectories()
 endif()
 
-if (BUILD_TEST)
+if (ENABLE_DEVELOPER_TESTS)
  add_subdirectory(tests)
 endif()
 

README.md

@@ -10,7 +10,7 @@
 [Blog](https://blog.freecad.org)
 
 
-[![Release](https://img.shields.io/github/release/freecad/freecad.svg)](https://github.com/freecad/freecad/releases/latest) [![Master][freecad-master-status]][gitlab-branch-master] [![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad) [![Gitter](https://img.shields.io/gitter/room/freecad/freecad.svg)](https://gitter.im/freecad/freecad?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Liberapay](https://img.shields.io/liberapay/receives/FreeCAD.svg?logo=liberapay)](https://liberapay.com/FreeCAD)
+[![Release](https://img.shields.io/github/release/freecad/freecad.svg)](https://github.com/freecad/freecad/releases/latest) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad) [![Liberapay](https://img.shields.io/liberapay/receives/FreeCAD.svg?logo=liberapay)](https://liberapay.com/FreeCAD)
 
 <img src="https://user-images.githubusercontent.com/1828501/174066870-1692005b-f8d7-43fb-a289-6d2f07f73d7f.png" width="800"/>
 
@@ -53,19 +53,6 @@ For development releases check the [weekly-builds page](https://github.com/FreeC
 
 Other options are described at the [wiki Download page](https://wiki.freecad.org/Download).
 
-Build Status
-------------
-
-| Master | 0.20 | Translation |
-|:------:|:----:|:-----------:|
-|[![Master][freecad-master-status]][gitlab-branch-master]|[![0.20][freecad-0.20-status]][gitlab-branch-0.20]|[![Crowdin](https://d322cqt584bo4o.cloudfront.net/freecad/localized.svg)](https://crowdin.com/project/freecad)|
-
-[freecad-0.20-status]: https://gitlab.com/freecad/FreeCAD-CI/badges/releases/FreeCAD-0-20/pipeline.svg
-[freecad-master-status]: https://gitlab.com/freecad/FreeCAD-CI/badges/master/pipeline.svg
-[gitlab-branch-0.20]: https://gitlab.com/freecad/FreeCAD-CI/-/commits/releases/FreeCAD-0-20
-[gitlab-branch-master]: https://gitlab.com/freecad/FreeCAD-CI/-/commits/master
-[travis-builds]: https://travis-ci.org/FreeCAD/FreeCAD/builds
-
 Compiling
 ---------
 

cMake/FindCoin3DDoc.cmake

@@ -54,28 +54,8 @@ IF (COIN3D_FOUND)
  ${CMAKE_BINARY_DIR}/src/Doc
  )
  IF( EXISTS ${COIN3D_DOC_TAGFILE})
- SET( COIN3D_DOC_FOUND "YES"
- )
- #ELSE( EXISTS ${COIN3D_DOC_TAGFILE})
- # find_program(WGET_PROG wget
- # )
- # IF( EXISTS ${WGET_PROG})
- # execute_process(COMMAND ${WGET_PROG} 
- # -P ${CMAKE_BINARY_DIR}/src/Doc 
- # ${COIN3D_DOC_PATH}/coin.tag
- # )
- # find_file(COIN3D_DOC_TAGFILE coin.tag 
- # ${CMAKE_BINARY_DIR}/src/Doc
- # )
- # IF( EXISTS ${COIN3D_DOC_TAGFILE})
- # SET( COIN3D_DOC_FOUND "YES"
- # )
- # ENDIF( EXISTS ${COIN3D_DOC_TAGFILE})
- #
- # ENDIF( EXISTS ${WGET_PROG})
-
+ SET( COIN3D_DOC_FOUND "YES" )
  ENDIF( EXISTS ${COIN3D_DOC_TAGFILE})
-
  ENDIF( EXISTS ${COIN3D_DOC_PATH})
  ENDIF(APPLE)
  ENDIF(WIN32)

cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake

@@ -8,6 +8,7 @@ macro(InitializeFreeCADBuildOptions)
  option(FREECAD_USE_EXTERNAL_ZIPIOS "Use system installed zipios++ instead of the bundled." OFF)
  option(FREECAD_USE_EXTERNAL_SMESH "Use system installed smesh instead of the bundled." OFF)
  option(FREECAD_USE_EXTERNAL_KDL "Use system installed orocos-kdl instead of the bundled." OFF)
+ option(FREECAD_USE_EXTERNAL_FMT "Use system installed fmt library if available instead of fetching the source." ON)
  option(FREECAD_USE_FREETYPE "Builds the features using FreeType libs" ON)
  option(FREECAD_BUILD_DEBIAN "Prepare for a build of a Debian package" OFF)
  option(BUILD_WITH_CONDA "Set ON if you build FreeCAD with conda" OFF)
@@ -112,7 +113,7 @@ macro(InitializeFreeCADBuildOptions)
  option(BUILD_MATERIAL "Build the FreeCAD material module" ON)
  option(BUILD_MESH "Build the FreeCAD mesh module" ON)
  option(BUILD_MESH_PART "Build the FreeCAD mesh part module" ON)
- option(BUILD_FLAT_MESH "Build the FreeCAD flat mesh module" OFF)
+ option(BUILD_FLAT_MESH "Build the FreeCAD flat mesh module" ON)
  option(BUILD_OPENSCAD "Build the FreeCAD openscad module" ON)
  option(BUILD_PART "Build the FreeCAD part module" ON)
  option(BUILD_PART_DESIGN "Build the FreeCAD part design module" ON)
@@ -132,6 +133,7 @@ macro(InitializeFreeCADBuildOptions)
  option(BUILD_SURFACE "Build the FreeCAD surface module" ON)
  option(BUILD_VR "Build the FreeCAD Oculus Rift support (need Oculus SDK 4.x or higher)" OFF)
  option(BUILD_CLOUD "Build the FreeCAD cloud module" OFF)
+ option(ENABLE_DEVELOPER_TESTS "Build the FreeCAD unit tests suit" ON)
 
  if(MSVC)
  option(BUILD_FEM_NETGEN "Build the FreeCAD FEM module with the NETGEN mesher" ON)

cMake/FreeCAD_Helpers/PrintFinalReport.cmake

@@ -76,7 +76,7 @@ macro(PrintFinalReport)
  value(CMAKE_CXX_STANDARD)
  value(CMAKE_CXX_FLAGS)
  value(CMAKE_BUILD_TYPE)
- value(BUILD_TEST)
+ value(ENABLE_DEVELOPER_TESTS)
  value(FREECAD_USE_FREETYPE)
  value(FREECAD_USE_EXTERNAL_SMESH)
  value(BUILD_SMESH)

cMake/FreeCAD_Helpers/SetupLibFmt.cmake

@@ -3,7 +3,9 @@ macro(SetupLibFmt)
  # This internet check idea is borrowed from:
  # https://stackoverflow.com/questions/62214621/how-to-check-for-internet-connection-with-cmake-automatically-prevent-fails-if
 
- find_package(fmt QUIET)
+ if(FREECAD_USE_EXTERNAL_FMT)
+ find_package(fmt QUIET)
+ endif()
 
  if(fmt_FOUND)
  message(STATUS "find_package() was used to locate fmt version ${fmt_VERSION}")

cMake/FreeCAD_Helpers/SetupQt.cmake

@@ -23,7 +23,7 @@ if(BUILD_GUI)
  list (APPEND FREECAD_QT_COMPONENTS Designer)
  endif()
 endif()
-if (BUILD_TEST)
+if (ENABLE_DEVELOPER_TESTS)
  list (APPEND FREECAD_QT_COMPONENTS Test)
 endif ()
 
@@ -38,6 +38,8 @@ set(CMAKE_AUTOMOC TRUE)
 set(CMAKE_AUTOUIC TRUE)
 set(QtCore_MOC_EXECUTABLE ${Qt${FREECAD_QT_MAJOR_VERSION}Core_MOC_EXECUTABLE})
 
+add_definitions(-DQT_NO_KEYWORDS)
+
 message(STATUS "Set up to compile with Qt ${Qt${FREECAD_QT_MAJOR_VERSION}Core_VERSION}")
 
 # In Qt 5.15 they added more generic names for these functions: "backport" those new names

cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake

@@ -120,15 +120,15 @@ macro(SetupShibokenAndPyside)
  option(FREECAD_USE_SHIBOKEN "Links to the shiboken library at build time. If OFF its Python module is imported at runtime" OFF)
  endif()
 
- # Now try to import the shiboken Python module and print an error if it can't be loaded
+ # Now try to import the shiboken Python module and print a warning if it can't be loaded
  execute_process(
  COMMAND ${PYTHON_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION}"
  RESULT_VARIABLE FAILURE
  OUTPUT_VARIABLE PRINT_OUTPUT
  )
 
  if(FAILURE)
- message(FATAL_ERROR,
+ message(WARNING
  "==================================\n"
  "Shiboken${SHIBOKEN_MAJOR_VERSION} Python module not found.\n"
  "==================================\n")
@@ -148,14 +148,14 @@ macro(SetupShibokenAndPyside)
  option(FREECAD_USE_PYSIDE "Links to the PySide libraries at build time." OFF)
  endif()
 
- # Independent of the build option PySide modules must be loaded at runtime. Print an error if it fails.
+ # Independent of the build option PySide modules must be loaded at runtime. Print a warning if it fails.
  execute_process(
  COMMAND ${PYTHON_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};import os;print(os.path.dirname(PySide${PYSIDE_MAJOR_VERSION}.__file__), end='')"
  RESULT_VARIABLE FAILURE
  OUTPUT_VARIABLE PRINT_OUTPUT
  )
  if(FAILURE)
- message(FATAL_ERROR,
+ message(WARNING
  "================================\n"
  "PySide${PYSIDE_MAJOR_VERSION} Python module not found.\n"
  "================================\n")

package/fedora/freecad.spec

@@ -7,7 +7,7 @@
 
 # Maintainers: keep this list of plugins up to date
 # List plugins in %%{_libdir}/%{name}/lib, less '.so' and 'Gui.so', here
-%global plugins Fem FreeCAD PathApp Import Inspection Mesh MeshPart Part Points ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Path PathGui Spreadsheet SpreadsheetGui area DraftUtils DraftUtils libDriver libDriverDAT libDriverSTL libDriverUNV libE57Format libMEFISTO2 libSMDS libSMESH libSMESHDS libStdMeshers Measure TechDraw TechDrawGui libarea-native Surface SurfaceGui PathSimulator
+%global plugins Fem FreeCAD PathApp Import Inspection Mesh MeshPart Part Points ReverseEngineering Robot Sketcher Start Web PartDesignGui _PartDesign Path PathGui Spreadsheet SpreadsheetGui area DraftUtils DraftUtils flatmesh libDriver libDriverDAT libDriverSTL libDriverUNV libE57Format libMEFISTO2 libSMDS libSMESH libSMESHDS libStdMeshers Measure TechDraw TechDrawGui libarea-native Surface SurfaceGui PathSimulator
 
 
 # Some configuration options for other environments
@@ -232,7 +232,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS
 %endif
  -DPACKAGE_WCREF="%{release} (Git)" \
  -DPACKAGE_WCURL="git://github.com/%{github_name}/FreeCAD.git master" \
- -DBUILD_TEST=FALSE \
+ -DENABLE_DEVELOPER_TESTS=FALSE \
  ../
 
 make fc_version

src/App/Application.cpp

@@ -3148,7 +3148,7 @@ std::tuple<QString, QString, QString> getCustomPaths()
 }
 
 /*!
- * \brief getCustomPaths
+ * \brief getStandardPaths
  * Returns a tuple of XDG-compliant standard paths names where to store config, data and cached files.
  * The method therefore reads the environment variables:
  * \list