CMake: Modernize build files using outdated Python variables.

2025-02-15 20:04:22 +00:00
parent de9bd5e1ce
commit 27ebc68a11
72 changed files with 113 additions and 124 deletions
--- a/src/3rdParty/libkdtree/python-bindings/CMakeLists.txt
+++ b/src/3rdParty/libkdtree/python-bindings/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/..)
 # Build the _kdtree python module
 set_source_files_properties (py-kdtree.i PROPERTIES CPLUSPLUS ON)
 swig_add_module (kdtree python py-kdtree.i)
-swig_link_libraries (kdtree ${PYTHON_LIBRARIES})
+swig_link_libraries (kdtree ${Python3_LIBRARIES})

 # Copy the test file into the build dir
 install (FILES py-kdtree_test.py DESTINATION ${CMAKE_INSTALL_PREFIX}/python)
--- a/src/App/CMakeLists.txt
+++ b/src/App/CMakeLists.txt
@@ -57,7 +57,7 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${ZIPIOS_INCLUDES}
--- a/src/Base/CMakeLists.txt
+++ b/src/Base/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${Boost_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${PYCXX_INCLUDE_DIR}
@@ -65,7 +65,7 @@ list(APPEND FreeCADBase_LIBS ${QtCore_LIBRARIES})
 list(APPEND FreeCADBase_LIBS fmt::fmt)

 if (BUILD_DYNAMIC_LINK_PYTHON)
-    list(APPEND FreeCADBase_LIBS ${PYTHON_LIBRARIES})
+    list(APPEND FreeCADBase_LIBS ${Python3_LIBRARIES})
 endif (BUILD_DYNAMIC_LINK_PYTHON)

 # needed for OpenSUSE
--- a/src/Build/CMakeLists.txt
+++ b/src/Build/CMakeLists.txt
@@ -12,7 +12,7 @@ if (NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/Version.h)
    add_custom_command(
        OUTPUT version_file
        BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/Version.h
-        COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/SubWCRev.py
+        COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/SubWCRev.py
            --srcdir=${CMAKE_SOURCE_DIR} --bindir=${CMAKE_BINARY_DIR}
        COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/Version.h.out
            ${CMAKE_CURRENT_BINARY_DIR}/Version.h
--- a/src/Doc/ThirdPartyLibraries.html.cmake
+++ b/src/Doc/ThirdPartyLibraries.html.cmake
@@ -157,7 +157,7 @@ Additional BSD Notice
 <hr>

 <h3><a name="_TocPython"></a>Python</h3>
-<p>Version: ${PYTHON_VERSION_STRING}</p>
+<p>Version: ${Python3_VERSION}</p>
 <p>Web site: <a href="https://www.python.org/">https://www.python.org/</a></p>
 <p>License: <a href="https://docs.python.org/3.6/license.html">https://docs.python.org/3.6/license.html</a></p>

--- a/src/Ext/freecad/CMakeLists.txt
+++ b/src/Ext/freecad/CMakeLists.txt
@@ -1,12 +1,12 @@
-if (${PYTHON_VERSION_STRING} VERSION_LESS "3.10")
+if (${Python3_VERSION} VERSION_LESS "3.10")
    # deprecated distutils package still required for ubuntu 20.04 and similar
    # see https://bugs.launchpad.net/ubuntu/+source/python3.8/+bug/2039511
    # TODO: remove this once we drop support for 20.04
-    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+    EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
        "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"
        OUTPUT_VARIABLE python_libs OUTPUT_STRIP_TRAILING_WHITESPACE )
 else()
-    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+    EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
        "from sysconfig import get_path; print(get_path('purelib'))"
        OUTPUT_VARIABLE python_libs OUTPUT_STRIP_TRAILING_WHITESPACE )
 endif()
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -60,7 +60,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}/DAGView
    ${Boost_INCLUDE_DIRS}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${ZIPIOS_INCLUDES}
--- a/src/MacAppBundle/CMakeLists.txt
+++ b/src/MacAppBundle/CMakeLists.txt
@@ -22,7 +22,7 @@ endif()
 #
 if(FREECAD_CREATE_MAC_APP)

-set(PYTHON_DIR_BASENAME python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+set(PYTHON_DIR_BASENAME python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})

 if(PYTHON_LIBRARY MATCHES "(.*Python\\.framework).*")
    #framework
--- a/src/Main/CMakeLists.txt
+++ b/src/Main/CMakeLists.txt
@@ -10,7 +10,7 @@ if(BUILD_GUI)
        ${ZLIB_INCLUDE_DIR}
        ${QtWidgets_INCLUDE_DIRS}
        ${QT_INCLUDE_DIR}
-        ${PYTHON_INCLUDE_DIRS}
+        ${Python3_INCLUDE_DIRS}
        ${XercesC_INCLUDE_DIRS}
    )
 else(BUILD_GUI)
@@ -18,7 +18,7 @@ else(BUILD_GUI)
        ${Boost_INCLUDE_DIRS}
        ${ZLIB_INCLUDE_DIR}
        ${QT_INCLUDE_DIR}
-        ${PYTHON_INCLUDE_DIRS}
+        ${Python3_INCLUDE_DIRS}
        ${XercesC_INCLUDE_DIRS}
    )
 endif(BUILD_GUI)
@@ -40,7 +40,7 @@ if(BUILD_GUI)
        # executables have to be linked against python libraries,
        # because extension modules are not.
        list(APPEND FreeCAD_LIBS
-            ${PYTHON_LIBRARIES}
+            ${Python3_LIBRARIES}
        )
    endif(NOT BUILD_DYNAMIC_LINK_PYTHON)

@@ -88,7 +88,7 @@ if(NOT BUILD_DYNAMIC_LINK_PYTHON)
    # executables have to be linked against python libraries,
    # because extension modules are not.
    list(APPEND FreeCADMainCmd_LIBS
-        ${PYTHON_LIBRARIES}
+        ${Python3_LIBRARIES}
    )
 endif(NOT BUILD_DYNAMIC_LINK_PYTHON)

--- a/src/Mod/Assembly/App/CMakeLists.txt
+++ b/src/Mod/Assembly/App/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
    ${CMAKE_BINARY_DIR}/src
    ${CMAKE_CURRENT_BINARY_DIR}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
 )
 link_directories(${OCC_LIBRARY_DIR})

--- a/src/Mod/Assembly/Gui/CMakeLists.txt
+++ b/src/Mod/Assembly/Gui/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${COIN3D_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
 )
 link_directories(${OCC_LIBRARY_DIR})

--- a/src/Mod/CAM/App/CMakeLists.txt
+++ b/src/Mod/CAM/App/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/CAM/Gui/CMakeLists.txt
+++ b/src/Mod/CAM/Gui/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
    ${ZLIB_INCLUDE_DIR}
    ${OCC_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )

--- a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt
+++ b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
 )
--- a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
+++ b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(
    ${ZLIB_INCLUDE_DIR}
    ${OCC_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}

 )
--- a/src/Mod/CAM/libarea/CMakeLists.txt
+++ b/src/Mod/CAM/libarea/CMakeLists.txt
@@ -9,7 +9,7 @@ if(MSVC)
 endif(MSVC)

 include_directories(
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_SOURCE_DIR}/src/Mod/Import/App/dxf
@@ -24,14 +24,14 @@ if(NOT FREECAD_USE_PYBIND11)
        if (FORCE_BOOST_PY_SUFFIX)
            set(BOOST_PY_SUFFIX ${FORCE_BOOST_PY_SUFFIX})
        else ()
-            set(BOOST_PY_SUFFIX ${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+            set(BOOST_PY_SUFFIX ${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
        endif ()

        find_package( Boost COMPONENTS python${BOOST_PY_SUFFIX} )
        if (NOT Boost_PYTHON${BOOST_PY_SUFFIX}_FOUND)
            # try just the major version
-            find_package( Boost COMPONENTS python${PYTHON_VERSION_MAJOR} )
-            if (NOT Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
+            find_package( Boost COMPONENTS python${Python3_VERSION_MAJOR} )
+            if (NOT Boost_PYTHON${Python3_VERSION_MAJOR}_FOUND)
                # unversioned
                find_package( Boost COMPONENTS python REQUIRED)
            endif()
@@ -135,7 +135,7 @@ if(MSVC)
        ${area_native_LIBS}
    )
    if(BUILD_DYNAMIC_LINK_PYTHON)
-        list(APPEND area_LIBS ${PYTHON_LIBRARIES})
+        list(APPEND area_LIBS ${Python3_LIBRARIES})
    endif(BUILD_DYNAMIC_LINK_PYTHON)
 elseif(MINGW)
    set(area_native_LIBS
@@ -146,7 +146,7 @@ elseif(MINGW)
        ${area_native_LIBS}
    )
    if(BUILD_DYNAMIC_LINK_PYTHON)
-        list(APPEND area_LIBS ${PYTHON_LIBRARIES})
+        list(APPEND area_LIBS ${Python3_LIBRARIES})
    endif(BUILD_DYNAMIC_LINK_PYTHON)
 else(MSVC)
    set(area_native_LIBS
@@ -155,7 +155,7 @@ else(MSVC)
        ${Boost_LIBRARIES}
    )
    if(BUILD_DYNAMIC_LINK_PYTHON)
-        list(APPEND area_LIBS ${PYTHON_LIBRARIES})
+        list(APPEND area_LIBS ${Python3_LIBRARIES})
    endif(BUILD_DYNAMIC_LINK_PYTHON)
 endif(MSVC)

@@ -178,15 +178,15 @@ SET_BIN_DIR(area area /Mod/CAM)
 SET_PYTHON_PREFIX_SUFFIX(area)

 # this figures out where to install the Python modules
-if (${PYTHON_VERSION_STRING} VERSION_LESS "3.10")
+if (${Python3_VERSION} VERSION_LESS "3.10")
    # deprecated distutils package still required for ubuntu 20.04 and similar
    # see https://bugs.launchpad.net/ubuntu/+source/python3.8/+bug/2039511
    # TODO: remove this once we drop support for 20.04
-    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+    EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
        "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True))"
        OUTPUT_VARIABLE Python_site_packages OUTPUT_STRIP_TRAILING_WHITESPACE )
 else()
-    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+    EXECUTE_PROCESS(COMMAND ${Python3_EXECUTABLE} -c
        "from sysconfig import get_path; print(get_path('platlib'))"
        OUTPUT_VARIABLE Python_site_packages OUTPUT_STRIP_TRAILING_WHITESPACE )
 endif()
--- a/src/Mod/Cloud/App/CMakeLists.txt
+++ b/src/Mod/Cloud/App/CMakeLists.txt
@@ -5,7 +5,7 @@ endif()
 include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Cloud/Gui/CMakeLists.txt
+++ b/src/Mod/Cloud/Gui/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
 )

 set(CloudGui_LIBS
--- a/src/Mod/Draft/App/CMakeLists.txt
+++ b/src/Mod/Draft/App/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${QT_QTCORE_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Drawing/App/CMakeLists.txt
+++ b/src/Mod/Drawing/App/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )
 link_directories(${OCC_LIBRARY_DIR})
--- a/src/Mod/Drawing/Gui/CMakeLists.txt
+++ b/src/Mod/Drawing/Gui/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Fem/App/CMakeLists.txt
+++ b/src/Mod/Fem/App/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${SMESH_INCLUDE_DIR}
--- a/src/Mod/Fem/Gui/CMakeLists.txt
+++ b/src/Mod/Fem/Gui/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${SMESH_INCLUDE_DIR}
    ${VTK_INCLUDE_DIRS}
 )
--- a/src/Mod/Import/App/CMakeLists.txt
+++ b/src/Mod/Import/App/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )

--- a/src/Mod/Import/Gui/CMakeLists.txt
+++ b/src/Mod/Import/Gui/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
 )

 link_directories(${OCC_LIBRARY_DIR})
--- a/src/Mod/Inspection/App/CMakeLists.txt
+++ b/src/Mod/Inspection/App/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Inspection/Gui/CMakeLists.txt
+++ b/src/Mod/Inspection/Gui/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/JtReader/App/CMakeLists.txt
+++ b/src/Mod/JtReader/App/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
 )

 link_directories(${OCC_LIBRARY_DIR})
--- a/src/Mod/Material/App/CMakeLists.txt
+++ b/src/Mod/Material/App/CMakeLists.txt
@@ -13,7 +13,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${Boost_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Material/Gui/CMakeLists.txt
+++ b/src/Mod/Material/Gui/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Measure/App/CMakeLists.txt
+++ b/src/Mod/Measure/App/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )
 link_directories(${OCC_LIBRARY_DIR})
--- a/src/Mod/Measure/Gui/CMakeLists.txt
+++ b/src/Mod/Measure/Gui/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
 )
--- a/src/Mod/Mesh/App/CMakeLists.txt
+++ b/src/Mod/Mesh/App/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_SOURCE_DIR}/src/3rdParty/libkdtree
    ${Boost_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Mesh/Gui/CMakeLists.txt
+++ b/src/Mod/Mesh/Gui/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}/Inventor/annex
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/MeshPart/App/CMakeLists.txt
+++ b/src/Mod/MeshPart/App/CMakeLists.txt
@@ -15,7 +15,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${SMESH_INCLUDE_DIR}
    ${VTK_INCLUDE_DIRS}
    ${EIGEN3_INCLUDE_DIR}
@@ -109,7 +109,7 @@ if (BUILD_FLAT_MESH)

        add_library(flatmesh SHARED ${FLATMESH_SRCS})
        SET_PYTHON_PREFIX_SUFFIX(flatmesh)
-        target_link_libraries(flatmesh ${PYTHON_LIBRARIES} ${MeshPart_LIBS})
+        target_link_libraries(flatmesh ${Python3_LIBRARIES} ${MeshPart_LIBS})

        SET_BIN_DIR(flatmesh flatmesh /Mod/MeshPart)
        install(TARGETS flatmesh DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -120,14 +120,14 @@ if (BUILD_FLAT_MESH)
            if (FORCE_BOOST_PY_SUFFIX)
                set(BOOST_PY_SUFFIX ${FORCE_BOOST_PY_SUFFIX})
            else ()
-                set(BOOST_PY_SUFFIX ${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
+                set(BOOST_PY_SUFFIX ${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
            endif ()

            find_package( Boost COMPONENTS python${BOOST_PY_SUFFIX} )
            if (NOT Boost_PYTHON${BOOST_PY_SUFFIX}_FOUND)
                # try just the major version
-                find_package( Boost COMPONENTS python${PYTHON_VERSION_MAJOR} )
-                if (NOT Boost_PYTHON${PYTHON_VERSION_MAJOR}_FOUND)
+                find_package( Boost COMPONENTS python${Python3_VERSION_MAJOR} )
+                if (NOT Boost_PYTHON${Python3_VERSION_MAJOR}_FOUND)
                    # unversioned
                    find_package( Boost COMPONENTS python REQUIRED)
                endif()
@@ -150,7 +150,7 @@ if (BUILD_FLAT_MESH)
                SET_PYTHON_PREFIX_SUFFIX(flatmesh)

                if (BUILD_DYNAMIC_LINK_PYTHON)
-                    target_link_libraries(flatmesh ${PYTHON_LIBRARIES})
+                    target_link_libraries(flatmesh ${Python3_LIBRARIES})
                endif(BUILD_DYNAMIC_LINK_PYTHON)

                target_link_libraries(flatmesh ${MeshPart_LIBS} ${Boost_LIBRARIES})
--- a/src/Mod/MeshPart/Gui/CMakeLists.txt
+++ b/src/Mod/MeshPart/Gui/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
    ${OCC_INCLUDE_DIR}
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
 )

 link_directories(${OCC_LIBRARY_DIR})
--- a/src/Mod/Part/App/CMakeLists.txt
+++ b/src/Mod/Part/App/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Part/Gui/CMakeLists.txt
+++ b/src/Mod/Part/Gui/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/PartDesign/App/CMakeLists.txt
+++ b/src/Mod/PartDesign/App/CMakeLists.txt
@@ -8,7 +8,7 @@ include_directories(
    ${QT_INCLUDE_DIR}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${QT_INCLUDE_DIR}
    ${CMAKE_SOURCE_DIR}/src/3rdParty/json/single_include/nlohmann/
--- a/src/Mod/PartDesign/Gui/CMakeLists.txt
+++ b/src/Mod/PartDesign/Gui/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${OCC_INCLUDE_DIR}
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${EIGEN3_INCLUDE_DIR}
    ${ZIPIOS_INCLUDES}
--- a/src/Mod/Points/App/CMakeLists.txt
+++ b/src/Mod/Points/App/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${Boost_INCLUDE_DIRS}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Points/Gui/CMakeLists.txt
+++ b/src/Mod/Points/Gui/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/ReverseEngineering/App/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt
@@ -22,7 +22,7 @@ include_directories(
    ${CMAKE_SOURCE_DIR}/src
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
+++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${COIN3D_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Robot/App/CMakeLists.txt
+++ b/src/Mod/Robot/App/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Robot/Gui/CMakeLists.txt
+++ b/src/Mod/Robot/Gui/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
    ${ZLIB_INCLUDE_DIR}
    ${OCC_INCLUDE_DIR}
    ${EIGEN3_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )
 link_directories(${OCC_LIBRARY_DIR})
--- a/src/Mod/Sandbox/App/CMakeLists.txt
+++ b/src/Mod/Sandbox/App/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${Boost_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
 )
--- a/src/Mod/Sandbox/Gui/CMakeLists.txt
+++ b/src/Mod/Sandbox/Gui/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
--- a/src/Mod/Sketcher/App/CMakeLists.txt
+++ b/src/Mod/Sketcher/App/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
    ${OCC_INCLUDE_DIR}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${EIGEN3_INCLUDE_DIR}
 )
--- a/src/Mod/Sketcher/Gui/CMakeLists.txt
+++ b/src/Mod/Sketcher/Gui/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${COIN3D_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
    ${EIGEN3_INCLUDE_DIR}
--- a/src/Mod/Spreadsheet/App/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/App/CMakeLists.txt
@@ -5,7 +5,7 @@ endif(WIN32)
 include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${CMAKE_CURRENT_BINARY_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${Boost_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Spreadsheet/Gui/CMakeLists.txt
+++ b/src/Mod/Spreadsheet/Gui/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
    ${COIN3D_INCLUDE_DIRS}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )

--- a/src/Mod/Start/App/CMakeLists.txt
+++ b/src/Mod/Start/App/CMakeLists.txt
@@ -22,7 +22,7 @@
 #  ***************************************************************************/

 include_directories(
-        ${PYTHON_INCLUDE_DIRS}
+        ${Python3_INCLUDE_DIRS}
        ${QtCore_INCLUDE_DIRS}
        ${ZIPIOS_INCLUDES}
 )
--- a/src/Mod/Start/Gui/CMakeLists.txt
+++ b/src/Mod/Start/Gui/CMakeLists.txt
@@ -25,7 +25,7 @@ include_directories(
        ${CMAKE_CURRENT_BINARY_DIR}
        ${Boost_INCLUDE_DIRS}
        ${COIN3D_INCLUDE_DIRS}
-        ${PYTHON_INCLUDE_DIRS}
+        ${Python3_INCLUDE_DIRS}
        ${QtCore_INCLUDE_DIRS}
        ${QtSvg_INCLUDE_DIRS}
        ${QtUiTools_INCLUDE_DIRS}
--- a/src/Mod/Surface/App/CMakeLists.txt
+++ b/src/Mod/Surface/App/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(
  ${CMAKE_CURRENT_SOURCE_DIR}
  ${Boost_INCLUDE_DIRS}
  ${OCC_INCLUDE_DIR}
-  ${PYTHON_INCLUDE_DIRS}
+  ${Python3_INCLUDE_DIRS}
  ${ZLIB_INCLUDE_DIR}
  ${XercesC_INCLUDE_DIRS}
  ${FREETYPE_INCLUDE_DIRS}
--- a/src/Mod/Surface/Gui/CMakeLists.txt
+++ b/src/Mod/Surface/Gui/CMakeLists.txt
@@ -7,7 +7,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
 )
--- a/src/Mod/TechDraw/App/CMakeLists.txt
+++ b/src/Mod/TechDraw/App/CMakeLists.txt
@@ -9,7 +9,7 @@ include_directories(
    ${OCC_INCLUDE_DIR}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )

--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -18,7 +18,7 @@ include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
    ${ZIPIOS_INCLUDES}
    ${ZLIB_INCLUDE_DIR}
--- a/src/Mod/Test/Gui/CMakeLists.txt
+++ b/src/Mod/Test/Gui/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${CMAKE_SOURCE_DIR}/src
    ${Boost_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )

--- a/src/Mod/Web/App/CMakeLists.txt
+++ b/src/Mod/Web/App/CMakeLists.txt
@@ -3,7 +3,7 @@ include_directories(
    ${CMAKE_CURRENT_BINARY_DIR}
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
 )

--- a/src/Tools/_TEMPLATE_/App/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/App/CMakeLists.txt
@@ -2,7 +2,7 @@
 include_directories(
    ${Boost_INCLUDE_DIRS}
    ${OCC_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
    ${XercesC_INCLUDE_DIRS}
 )
--- a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
+++ b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(
    ${Boost_INCLUDE_DIRS}
    ${COIN3D_INCLUDE_DIRS}
    ${ZLIB_INCLUDE_DIR}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${XercesC_INCLUDE_DIRS}
 )

--- a/src/Tools/embedded/Qt/cxx/CMakeLists.txt
+++ b/src/Tools/embedded/Qt/cxx/CMakeLists.txt
@@ -13,12 +13,12 @@ find_package(Boost COMPONENTS signals REQUIRED)

 # Python
 find_package(PythonInterp REQUIRED)
-set(Python_ADDITIONAL_VERSIONS ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-IF (NOT DEFINED PYTHON_VERSION_STRING)
+set(Python_ADDITIONAL_VERSIONS ${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR})
+IF (NOT DEFINED Python3_VERSION)
    find_package(PythonLibs REQUIRED)
-ELSE (NOT DEFINED PYTHON_VERSION_STRING)
-    find_package(PythonLibs ${PYTHON_VERSION_STRING} EXACT)
-ENDIF(NOT DEFINED PYTHON_VERSION_STRING)
+ELSE (NOT DEFINED Python3_VERSION)
+    find_package(PythonLibs ${Python3_VERSION} EXACT)
+ENDIF(NOT DEFINED Python3_VERSION)

 # FreeCAD
 set(FREECAD_SRC_DIR ${CMAKE_SOURCE_DIR}/../../../.. CACHE PATH  "FreeCAD sources")
@@ -32,7 +32,7 @@ add_definitions(-DBOOST_ALL_DYN_LINK)
 include_directories(
    ${Boost_INCLUDE_DIRS}
    #${COIN3D_INCLUDE_DIRS}
-    ${PYTHON_INCLUDE_DIRS}
+    ${Python3_INCLUDE_DIRS}
    ${Qt5Core_INCLUDE_DIRS}
    ${Qt5Gui_INCLUDE_DIRS}
    ${Qt5Widgets_INCLUDE_DIRS}
@@ -52,7 +52,7 @@ set(MyPlugin_SRCS
 set(MyPlugin_LIBS
    ${Boost_LIBRARIES}
    #${COIN3D_LIBRARIES}
-    ${PYTHON_LIBRARIES}
+    ${Python3_LIBRARIES}
    ${Qt5Core_LIBRARIES}
    ${Qt5Gui_LIBRARIES}
    ${Qt5Widgets_LIBRARIES}
@@ -70,7 +70,7 @@ set(FreeCADPlugin_SRCS
 set(FreeCADPlugin_LIBS
    ${Boost_LIBRARIES}
    #${COIN3D_LIBRARIES}
-    ${PYTHON_LIBRARIES}
+    ${Python3_LIBRARIES}
    ${Qt5Core_LIBRARIES}
    ${Qt5Gui_LIBRARIES}
    ${Qt5Widgets_LIBRARIES}