Merge branch 'master' into draft-snap

.travis.yml

@@ -66,7 +66,7 @@ jobs:
         env:
           - CC=clang-10
           - CXX=clang++-10
-          - CMAKE_ARGS="-DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_FEM_NETGEN=ON -DBUILD_QT5=ON"
+          - CMAKE_ARGS="-DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_FEM_NETGEN=ON"
           - CACHE_NAME=JOB1
 
       - os: linux
@@ -86,22 +86,9 @@ jobs:
           - CXX=g++-10
           - CC_FOR_BUILD=gcc-10
           - CXX_FOR_BUILD=g++-10
-          - CMAKE_ARGS="-DCMAKE_CXX_COMPILER=/usr/bin/c++ -DCMAKE_C_COMPILER=/usr/bin/cc -DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_FEM_NETGEN=ON -DBUILD_QT5=ON"
+          - CMAKE_ARGS="-DCMAKE_CXX_COMPILER=/usr/bin/c++ -DCMAKE_C_COMPILER=/usr/bin/cc -DPYTHON_EXECUTABLE=/usr/bin/python3 -DBUILD_FEM_NETGEN=ON"
           - CACHE_NAME=JOB2
 
-      - os: linux
-        dist: bionic
-        language: cpp
-        compiler: gcc-7
-        cache: ccache
-        env:
-          - CC=gcc-7
-          - CXX=g++-7
-          - CC_FOR_BUILD=gcc-7
-          - CXX_FOR_BUILD=g++-7
-          - CMAKE_ARGS="-DCMAKE_CXX_COMPILER=/usr/bin/c++ -DCMAKE_C_COMPILER=/usr/bin/cc"
-          - CACHE_NAME=JOB3
-
             #      - os: osx
             #        osx_image: xcode11.6
             #        language: cpp

CMakeLists.txt

@@ -1,5 +1,5 @@
-# april 2020, the oldest we have to support : Ununtu 16.04 LTS (Xenial)
-cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
+# March 2021, the oldest we have to support : Ununtu 18.04 LTS
+cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 
 # policy CMP0072 was introduced with CMake 3.11
 # relates to FindOpenGL module
@@ -17,8 +17,8 @@ project(FreeCAD)
 
 set(PACKAGE_VERSION_NAME "Vulcan")
 set(PACKAGE_VERSION_MAJOR "0")
-set(PACKAGE_VERSION_MINOR "19")
-set(PACKAGE_VERSION_PATCH "16100")
+set(PACKAGE_VERSION_MINOR "20")
+set(PACKAGE_VERSION_PATCH "0")
 set(PACKAGE_VERSION_SUFFIX "dev") # either "dev" for development snapshot or "" (empty string)
 set(FREECAD_VERSION_PATCH "0") # number of patch release (e.g. "4" for the 0.18.4 release)
 

LibraryVersions.h.cmake

@@ -9,5 +9,45 @@
 #  include <${OCC_INCLUDE_DIR}/Standard_Version.hxx>
 #endif
 
+
+/* No need for Boost (version info is always included in the source) */
+/* No need for Coin (version info is always included in the source) */
+/* No need for Python (version info is always included in the source) */
+/* No need for Qt (version info is always included in the source) */
+/* No need for zlib (version info is always included in the source) */
+
+// No CMake version info for SMESH, libarea, Zipios, or KDL
+
+// Eigen3
+constexpr char * FC_EIGEN3_VERSION = "${EIGEN3_VERSION}";
+
+// FreeType
+constexpr char * FC_FREETYPE_VERSION = "${FREETYPE_VERSION_STRING}";
+
+// pcl
+constexpr char * FC_PCL_VERSION = "${PCL_VERSION}";
+
+// PyCXX
+constexpr char * FC_PYCXX_VERSION = "${PYCXX_VERSION}";
+
+// PySide
+constexpr char * FC_PYSIDE_VERSION = "${PySide2_VERSION}";
+
+// PyBind
+constexpr char * FC_PYBIND11_VERSION = "${pybind11_VERSION}";
+
+// Shiboken
+constexpr char * FC_SHIBOKEN_VERSION = "${Shiboken2_VERSION}";
+
+// vtk
+constexpr char * FC_VTK_VERSION = "${VTK_VERSION}";
+
+// Xerces-C
+constexpr char * FC_XERCESC_VERSION = "${XercesC_VERSION}";
+
+// Pivy
+constexpr char * FC_PIVY_VERSION = "${PIVY_VERSION}";
+
+
 #endif // LIBRARY_VERSIONS_H
 

cMake/FindCoin3D.cmake

@@ -105,5 +105,21 @@ ENDIF (WIN32)
 IF(COIN3D_LIBRARIES)
   SET( COIN3D_FOUND "YES" )
   message(STATUS "Coin3D libraries found")
+
+  IF(NOT COIN3D_VERSION)
+    file(READ "${COIN3D_INCLUDE_DIRS}/Inventor/C/basic.h" _coin3d_basic_h)
+    string(REGEX MATCH "define[ \t]+COIN_MAJOR_VERSION[ \t]+([0-9?])" _coin3d_major_version_match "${_coin3d_basic_h}")
+    set(COIN3D_MAJOR_VERSION "${CMAKE_MATCH_1}")
+    string(REGEX MATCH "define[ \t]+COIN_MINOR_VERSION[ \t]+([0-9?])" _coin3d_minor_version_match "${_coin3d_basic_h}")
+    set(COIN3D_MINOR_VERSION "${CMAKE_MATCH_1}")
+    string(REGEX MATCH "define[ \t]+COIN_MICRO_VERSION[ \t]+([0-9?])" _coin3d_micro_version_match "${_coin3d_basic_h}")
+    set(COIN3D_MICRO_VERSION "${CMAKE_MATCH_1}")
+    set(COIN3D_VERSION "${COIN3D_MAJOR_VERSION}.${COIN3D_MINOR_VERSION}.${COIN3D_MICRO_VERSION}")
+  ENDIF()
+
+  IF(NOT PIVY_VERSION)
+    execute_process (COMMAND ${Python3_EXECUTABLE} -c "import pivy as p; print(p.__version__,end='')" OUTPUT_VARIABLE PIVY_VERSION)
+  ENDIF()
+
 ENDIF(COIN3D_LIBRARIES)
 

cMake/FindMEDFile.cmake

@@ -5,6 +5,7 @@
 #   MEDFILE_LIBRARIES
 #   MEDFILE_C_LIBRARIES
 #   MEDFILE_F_LIBRARIES
+#   MEDFILE_VERSION
 #
 #  The CMake (or environment) variable MEDFILE_ROOT_DIR can be set to
 #  guide the detection and indicate a root directory to look into.
@@ -56,3 +57,14 @@ ENDIF(MEDFILE_F_LIBRARIES)
 
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(MEDFile REQUIRED_VARS MEDFILE_INCLUDE_DIRS MEDFILE_LIBRARIES)
+
+IF(meddotH)
+    FILE(READ "${meddotH}" _med_h)
+    STRING(REGEX MATCH "define[ \t]+MED_MAJOR_NUM[ \t]+([0-9?])" _med_major_version_match "${_med_h}")
+    SET(MED_MAJOR_VERSION "${CMAKE_MATCH_1}")
+    STRING(REGEX MATCH "define[ \t]+MED_MINOR_NUM[ \t]+([0-9?])" _med_minor_version_match "${_med_h}")
+    SET(MED_MINOR_VERSION "${CMAKE_MATCH_1}")
+    STRING(REGEX MATCH "define[ \t]+MED_RELEASE_NUM[ \t]+([0-9?])" _med_release_version_match "${_med_h}")
+    SET(MED_RELEASE_VERSION "${CMAKE_MATCH_1}")
+    SET(MEDFILE_VERSION "${MED_MAJOR_VERSION}.${MED_MINOR_VERSION}.${MED_RELEASE_VERSION}")
+ENDIF()

cMake/FindMatplotlib.cmake

@@ -9,7 +9,7 @@
 #  MATPLOTLIB_VERSION_PATCH    - the patch version number of matplotlib
 #  MATPLOTLIB_PATH_DIRS        - path to the matplotlib include files
 
-IF(PYTHONINTERP_FOUND)
+IF(Python3_Interpreter_FOUND)
     # Try to import matplotlib into Python interpreter. Python
     # interpreter was found previously as required package, so
     # don't take care about this.

cMake/FindPyCXX.cmake

@@ -5,6 +5,7 @@
 # PYCXX_SOURCE_DIR
 # PYCXX_FOUND
 # PYCXX_SOURCES
+# PYCXX_VERSION
 #
 # The PYCXX_*_DIR variables can be set to tell this module where
 # the files are.

cMake/FindPySide2Tools.cmake

@@ -55,10 +55,10 @@ MACRO(PYSIDE_WRAP_UI outfiles)
     else()
         # Especially on Open Build Service we don't want changing date like
         # pyside2-uic generates in comments at beginning., which is why
-        # we follow the tool command with in-place sed.
+        # we follow the tool command with a POSIX-friendly sed.
         ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
           COMMAND "${PYSIDE2UICBINARY}" ${UICOPTIONS} "${infile}" -o "${outfile}"
-          COMMAND sed -i "/^# /d" "${outfile}"
+          COMMAND sed "/^# /d" "${outfile}" >"${outfile}.tmp" && mv "${outfile}.tmp" "${outfile}"
           MAIN_DEPENDENCY "${infile}"
         )
     endif()
@@ -85,7 +85,7 @@ MACRO(PYSIDE_WRAP_RC outfiles)
         # we follow the tool command with in-place sed.
         ADD_CUSTOM_COMMAND(OUTPUT "${outfile}"
           COMMAND "${PYSIDE2RCCBINARY}" ${RCCOPTIONS} "${infile}" ${PY_ATTRIBUTE} -o "${outfile}"
-          COMMAND sed -i "/^# /d" "${outfile}"
+          COMMAND sed "/^# /d" "${outfile}" >"${outfile}.tmp" && mv "${outfile}.tmp" "${outfile}"
           MAIN_DEPENDENCY "${infile}"
         )
     endif()