From 27ebc68a1102d49b7c9ec6e2cfc38bcffc8b1488 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Sat, 15 Feb 2025 20:04:22 +0000 Subject: [PATCH] CMake: Modernize build files using outdated Python variables. --- cMake/FindMatplotlib.cmake | 2 +- cMake/FindPySide2Tools.cmake | 6 +++--- .../CreatePackagingTargets.cmake | 8 ++++---- cMake/FreeCAD_Helpers/PrintFinalReport.cmake | 4 ++-- cMake/FreeCAD_Helpers/SetupPython.cmake | 13 +----------- .../SetupShibokenAndPyside.cmake | 8 ++++---- cMake/FreeCadMacros.cmake | 10 +++++----- package/fedora/freecad.spec | 2 +- .../libkdtree/python-bindings/CMakeLists.txt | 2 +- src/App/CMakeLists.txt | 2 +- src/Base/CMakeLists.txt | 4 ++-- src/Build/CMakeLists.txt | 2 +- src/Doc/ThirdPartyLibraries.html.cmake | 2 +- src/Ext/freecad/CMakeLists.txt | 6 +++--- src/Gui/CMakeLists.txt | 2 +- src/MacAppBundle/CMakeLists.txt | 2 +- src/Main/CMakeLists.txt | 8 ++++---- src/Mod/Assembly/App/CMakeLists.txt | 2 +- src/Mod/Assembly/Gui/CMakeLists.txt | 2 +- src/Mod/CAM/App/CMakeLists.txt | 2 +- src/Mod/CAM/Gui/CMakeLists.txt | 2 +- src/Mod/CAM/PathSimulator/App/CMakeLists.txt | 2 +- .../CAM/PathSimulator/AppGL/CMakeLists.txt | 2 +- src/Mod/CAM/libarea/CMakeLists.txt | 20 +++++++++---------- src/Mod/Cloud/App/CMakeLists.txt | 2 +- src/Mod/Cloud/Gui/CMakeLists.txt | 2 +- src/Mod/Draft/App/CMakeLists.txt | 2 +- src/Mod/Drawing/App/CMakeLists.txt | 2 +- src/Mod/Drawing/Gui/CMakeLists.txt | 2 +- src/Mod/Fem/App/CMakeLists.txt | 2 +- src/Mod/Fem/Gui/CMakeLists.txt | 2 +- src/Mod/Import/App/CMakeLists.txt | 2 +- src/Mod/Import/Gui/CMakeLists.txt | 2 +- src/Mod/Inspection/App/CMakeLists.txt | 2 +- src/Mod/Inspection/Gui/CMakeLists.txt | 2 +- src/Mod/JtReader/App/CMakeLists.txt | 2 +- src/Mod/Material/App/CMakeLists.txt | 2 +- src/Mod/Material/Gui/CMakeLists.txt | 2 +- src/Mod/Measure/App/CMakeLists.txt | 2 +- src/Mod/Measure/Gui/CMakeLists.txt | 2 +- src/Mod/Mesh/App/CMakeLists.txt | 2 +- src/Mod/Mesh/Gui/CMakeLists.txt | 2 +- src/Mod/MeshPart/App/CMakeLists.txt | 12 +++++------ src/Mod/MeshPart/Gui/CMakeLists.txt | 2 +- src/Mod/Part/App/CMakeLists.txt | 2 +- src/Mod/Part/Gui/CMakeLists.txt | 2 +- src/Mod/PartDesign/App/CMakeLists.txt | 2 +- src/Mod/PartDesign/Gui/CMakeLists.txt | 2 +- src/Mod/Points/App/CMakeLists.txt | 2 +- src/Mod/Points/Gui/CMakeLists.txt | 2 +- src/Mod/ReverseEngineering/App/CMakeLists.txt | 2 +- src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 2 +- src/Mod/Robot/App/CMakeLists.txt | 2 +- src/Mod/Robot/Gui/CMakeLists.txt | 2 +- src/Mod/Sandbox/App/CMakeLists.txt | 2 +- src/Mod/Sandbox/Gui/CMakeLists.txt | 2 +- src/Mod/Sketcher/App/CMakeLists.txt | 2 +- src/Mod/Sketcher/Gui/CMakeLists.txt | 2 +- src/Mod/Spreadsheet/App/CMakeLists.txt | 2 +- src/Mod/Spreadsheet/Gui/CMakeLists.txt | 2 +- src/Mod/Start/App/CMakeLists.txt | 2 +- src/Mod/Start/Gui/CMakeLists.txt | 2 +- src/Mod/Surface/App/CMakeLists.txt | 2 +- src/Mod/Surface/Gui/CMakeLists.txt | 2 +- src/Mod/TechDraw/App/CMakeLists.txt | 2 +- src/Mod/TechDraw/Gui/CMakeLists.txt | 2 +- src/Mod/Test/Gui/CMakeLists.txt | 2 +- src/Mod/Web/App/CMakeLists.txt | 2 +- src/Tools/_TEMPLATE_/App/CMakeLists.txt | 2 +- src/Tools/_TEMPLATE_/Gui/CMakeLists.txt | 2 +- src/Tools/embedded/Qt/cxx/CMakeLists.txt | 16 +++++++-------- tests/CMakeLists.txt | 4 ++-- 72 files changed, 113 insertions(+), 124 deletions(-) diff --git a/cMake/FindMatplotlib.cmake b/cMake/FindMatplotlib.cmake index 9c441e988a..12db1a174c 100644 --- a/cMake/FindMatplotlib.cmake +++ b/cMake/FindMatplotlib.cmake @@ -13,7 +13,7 @@ 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. - execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" + execute_process(COMMAND "${Python3_EXECUTABLE}" "-c" "import matplotlib as m; print(m.__version__); print(m.__path__[0]);" RESULT_VARIABLE _MATPLOTLIB_SEARCH_SUCCESS OUTPUT_VARIABLE _MATPLOTLIB_VALUES diff --git a/cMake/FindPySide2Tools.cmake b/cMake/FindPySide2Tools.cmake index b4ce0fa476..d14d8a9d19 100644 --- a/cMake/FindPySide2Tools.cmake +++ b/cMake/FindPySide2Tools.cmake @@ -5,7 +5,7 @@ if(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") #pyside2 tools are often in same location as python interpreter - get_filename_component(PYTHON_BIN_DIR ${PYTHON_EXECUTABLE} PATH) + get_filename_component(PYTHON_BIN_DIR ${Python3_EXECUTABLE} PATH) set(PYSIDE_BIN_DIR ${PYTHON_BIN_DIR}) endif(WIN32 OR ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") @@ -16,8 +16,8 @@ FIND_PACKAGE(Qt5 COMPONENTS Core Widgets) IF(Qt5Core_VERSION VERSION_LESS 5.14) # Legacy (< 5.14) - FIND_PROGRAM(PYSIDE2_UIC_EXECUTABLE NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} pyuic5 HINTS ${PYSIDE_BIN_DIR}) - FIND_PROGRAM(PYSIDE2_RCC_EXECUTABLE NAMES pyside2-rcc pyside2-rcc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} pyrcc5 HINTS ${PYSIDE_BIN_DIR}) + FIND_PROGRAM(PYSIDE2_UIC_EXECUTABLE NAMES python2-pyside2-uic pyside2-uic pyside2-uic-${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR} pyuic5 HINTS ${PYSIDE_BIN_DIR}) + FIND_PROGRAM(PYSIDE2_RCC_EXECUTABLE NAMES pyside2-rcc pyside2-rcc-${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR} pyrcc5 HINTS ${PYSIDE_BIN_DIR}) set(UICOPTIONS "") set(RCCOPTIONS "") ELSE() diff --git a/cMake/FreeCAD_Helpers/CreatePackagingTargets.cmake b/cMake/FreeCAD_Helpers/CreatePackagingTargets.cmake index de8b52c6d3..f779c3b103 100644 --- a/cMake/FreeCAD_Helpers/CreatePackagingTargets.cmake +++ b/cMake/FreeCAD_Helpers/CreatePackagingTargets.cmake @@ -4,14 +4,14 @@ macro(CreatePackagingTargets) # #add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) add_custom_target(dist-git - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py + COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py --bindir=${CMAKE_BINARY_DIR} --major=${PACKAGE_VERSION_MAJOR} --minor=${PACKAGE_VERSION_MINOR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) add_custom_target(distdfsg-git - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py + COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py --bindir=${CMAKE_BINARY_DIR} --major=${PACKAGE_VERSION_MAJOR} --minor=${PACKAGE_VERSION_MINOR} @@ -20,7 +20,7 @@ macro(CreatePackagingTargets) ) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX OR MINGW) add_custom_target(distcheck-git - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py + COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py --bindir=${CMAKE_BINARY_DIR} --major=${PACKAGE_VERSION_MAJOR} --minor=${PACKAGE_VERSION_MINOR} @@ -28,7 +28,7 @@ macro(CreatePackagingTargets) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) add_custom_target(distcheckdfsg-git - COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py + COMMAND ${Python3_EXECUTABLE} ${CMAKE_SOURCE_DIR}/src/Tools/makedist.py --bindir=${CMAKE_BINARY_DIR} --major=${PACKAGE_VERSION_MAJOR} --minor=${PACKAGE_VERSION_MINOR} diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake index 499ba9d1ea..600997b252 100644 --- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake +++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake @@ -65,7 +65,7 @@ macro(PrintFinalReport) simple(docdir ${CMAKE_INSTALL_DOCDIR}) simple(includedir ${CMAKE_INSTALL_INCLUDEDIR}) simple(libdir ${CMAKE_INSTALL_LIBDIR}) - simple(Python "${Python3_VERSION} [${PYTHON_EXECUTABLE}] Suffix: [${PYTHON_CONFIG_SUFFIX}]") + simple(Python "${Python3_VERSION} [${Python3_EXECUTABLE}] Suffix: [${PYTHON_CONFIG_SUFFIX}]") value(BLAS) section_end() @@ -84,7 +84,7 @@ macro(PrintFinalReport) value(BUILD_VR) value(CMAKE_PREFIX_PATH) value(FREECAD_QT_VERSION) - value(PYTHON_EXECUTABLE) + value(Python3_EXECUTABLE) value(PYTHON_LIBRARY) value(FREECAD_CREATE_MAC_APP) value(FREECAD_USE_PYBIND11) diff --git a/cMake/FreeCAD_Helpers/SetupPython.cmake b/cMake/FreeCAD_Helpers/SetupPython.cmake index a2887affcb..94bdcc77d3 100644 --- a/cMake/FreeCAD_Helpers/SetupPython.cmake +++ b/cMake/FreeCAD_Helpers/SetupPython.cmake @@ -3,18 +3,7 @@ macro(SetupPython) find_package(Python3 COMPONENTS Interpreter Development REQUIRED) - # For backwards compatibility with old CMake scripts - set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE}) - set(PYTHON_LIBRARIES ${Python3_LIBRARIES}) - set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS}) - set(PYTHON_LIBRARY_DIRS ${Python3_LIBRARY_DIRS}) - set(PYTHON_VERSION_STRING ${Python3_VERSION}) - set(PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR}) - set(PYTHON_VERSION_MINOR ${Python3_VERSION_MINOR}) - set(PYTHON_VERSION_PATCH ${Python3_VERSION_PATCH}) - set(PYTHONINTERP_FOUND ${Python3_Interpreter_FOUND}) - - if (${PYTHON_VERSION_STRING} VERSION_LESS "3.8") + if (${Python3_VERSION} VERSION_LESS "3.8") message(FATAL_ERROR "To build FreeCAD you need at least Python 3.8\n") endif() diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake index 56262511cb..9b8c35ec1d 100644 --- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake +++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake @@ -128,7 +128,7 @@ macro(SetupShibokenAndPyside) # 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}" + COMMAND ${Python3_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION}" RESULT_VARIABLE FAILURE OUTPUT_VARIABLE PRINT_OUTPUT ) @@ -140,7 +140,7 @@ macro(SetupShibokenAndPyside) "==================================\n") else() execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION};print(shiboken${SHIBOKEN_MAJOR_VERSION}.__version__, end='')" + COMMAND ${Python3_EXECUTABLE} -c "import shiboken${SHIBOKEN_MAJOR_VERSION};print(shiboken${SHIBOKEN_MAJOR_VERSION}.__version__, end='')" RESULT_VARIABLE FAILURE OUTPUT_VARIABLE Shiboken_VERSION ) @@ -154,7 +154,7 @@ macro(SetupShibokenAndPyside) # 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='')" + COMMAND ${Python3_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 ) @@ -165,7 +165,7 @@ macro(SetupShibokenAndPyside) "================================\n") else() execute_process( - COMMAND ${PYTHON_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};print(PySide${PYSIDE_MAJOR_VERSION}.__version__, end='')" + COMMAND ${Python3_EXECUTABLE} -c "import PySide${PYSIDE_MAJOR_VERSION};print(PySide${PYSIDE_MAJOR_VERSION}.__version__, end='')" RESULT_VARIABLE FAILURE OUTPUT_VARIABLE PySide_VERSION ) diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake index f7ad80837a..63f445d0ba 100644 --- a/cMake/FreeCadMacros.cmake +++ b/cMake/FreeCadMacros.cmake @@ -138,13 +138,13 @@ macro(generate_from_xml BASE_NAME) if(NOT EXISTS "${SOURCE_CPP_PATH}") # assures the source files are generated at least once message(STATUS "${SOURCE_CPP_PATH}") - execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" + execute_process(COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" ) endif() add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.h" "${CMAKE_CURRENT_BINARY_DIR}/${BASE_NAME}.cpp" - COMMAND ${PYTHON_EXECUTABLE} "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" ${BASE_NAME}.xml + COMMAND ${Python3_EXECUTABLE} "${TOOL_NATIVE_PATH}" --outputPath "${OUTPUT_NATIVE_PATH}" ${BASE_NAME}.xml MAIN_DEPENDENCY "${BASE_NAME}.xml" DEPENDS "${CMAKE_SOURCE_DIR}/src/Tools/bindings/templates/templateClassPyExport.py" @@ -160,7 +160,7 @@ macro(generate_from_py BASE_NAME OUTPUT_FILE) file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py" SOURCE_NATIVE_PATH) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}" - COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}" + COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}" MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${BASE_NAME}.py" DEPENDS "${TOOL_PATH}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" @@ -173,7 +173,7 @@ macro(generate_from_any INPUT_FILE OUTPUT_FILE VARIABLE) file(TO_NATIVE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT_FILE}" SOURCE_NATIVE_PATH) add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT_FILE}" - COMMAND "${PYTHON_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}" "${VARIABLE}" + COMMAND "${Python3_EXECUTABLE}" "${TOOL_NATIVE_PATH}" "${SOURCE_NATIVE_PATH}" "${OUTPUT_FILE}" "${VARIABLE}" MAIN_DEPENDENCY "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT_FILE}" DEPENDS "${TOOL_PATH}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" @@ -279,7 +279,7 @@ ENDMACRO(SET_PYTHON_PREFIX_SUFFIX) # install directory, and then appends the package name and "/include" to the end macro(find_pip_package PACKAGE) execute_process( - COMMAND ${PYTHON_EXECUTABLE} -m pip show ${PACKAGE} + COMMAND ${Python3_EXECUTABLE} -m pip show ${PACKAGE} RESULT_VARIABLE FAILURE OUTPUT_VARIABLE PRINT_OUTPUT ) diff --git a/package/fedora/freecad.spec b/package/fedora/freecad.spec index 43ffcac6c9..0de38bd387 100644 --- a/package/fedora/freecad.spec +++ b/package/fedora/freecad.spec @@ -204,7 +204,7 @@ LDFLAGS='-Wl,--as-needed -Wl,--no-undefined'; export LDFLAGS -DPYTHON_SUFFIX=.%{py_suffix} \ -DPYSIDE_INCLUDE_DIR=/usr/include/PySide2 \ -DPYSIDE_LIBRARY=-lpyside2.%{py_suffix} \ - -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python3 \ + -DPython3_EXECUTABLE:FILEPATH=/usr/bin/python3 \ -DMEDFILE_INCLUDE_DIRS=%{MEDFILE_INCLUDE_DIRS} \ -DOpenGL_GL_PREFERENCE=GLVND \ -DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin4 \ diff --git a/src/3rdParty/libkdtree/python-bindings/CMakeLists.txt b/src/3rdParty/libkdtree/python-bindings/CMakeLists.txt index 4200cf4110..09cfff97e4 100644 --- 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) diff --git a/src/App/CMakeLists.txt b/src/App/CMakeLists.txt index ef2d81f6f5..a99498a77b 100644 --- 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} diff --git a/src/Base/CMakeLists.txt b/src/Base/CMakeLists.txt index d4f363aa2a..fc5d0cdaf6 100644 --- 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 diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index 97e54000d6..de350a4343 100644 --- 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 diff --git a/src/Doc/ThirdPartyLibraries.html.cmake b/src/Doc/ThirdPartyLibraries.html.cmake index 9cccc218f2..6339e62014 100644 --- a/src/Doc/ThirdPartyLibraries.html.cmake +++ b/src/Doc/ThirdPartyLibraries.html.cmake @@ -157,7 +157,7 @@ Additional BSD Notice

Python

-

Version: ${PYTHON_VERSION_STRING}

+

Version: ${Python3_VERSION}

Web site: https://www.python.org/

License: https://docs.python.org/3.6/license.html

diff --git a/src/Ext/freecad/CMakeLists.txt b/src/Ext/freecad/CMakeLists.txt index 4681b8f881..edee6b7c86 100644 --- 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() diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt index 91abf8418c..d264fd83dc 100644 --- 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} diff --git a/src/MacAppBundle/CMakeLists.txt b/src/MacAppBundle/CMakeLists.txt index bab8d510c1..6149d9fac9 100644 --- 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 diff --git a/src/Main/CMakeLists.txt b/src/Main/CMakeLists.txt index 800644392a..2d0cde630e 100644 --- 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) diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt index bf8e14e7ac..5a541c5150 100644 --- 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}) diff --git a/src/Mod/Assembly/Gui/CMakeLists.txt b/src/Mod/Assembly/Gui/CMakeLists.txt index e7a7b44591..83d34df8f2 100644 --- 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}) diff --git a/src/Mod/CAM/App/CMakeLists.txt b/src/Mod/CAM/App/CMakeLists.txt index eb044c33a6..75f186d863 100644 --- 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} diff --git a/src/Mod/CAM/Gui/CMakeLists.txt b/src/Mod/CAM/Gui/CMakeLists.txt index b70350933f..6ac05847a2 100644 --- 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} ) diff --git a/src/Mod/CAM/PathSimulator/App/CMakeLists.txt b/src/Mod/CAM/PathSimulator/App/CMakeLists.txt index 6913f92773..a3bd66b2a3 100644 --- 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} ) diff --git a/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt b/src/Mod/CAM/PathSimulator/AppGL/CMakeLists.txt index d2d5e3d99a..927d2d282f 100644 --- 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} ) diff --git a/src/Mod/CAM/libarea/CMakeLists.txt b/src/Mod/CAM/libarea/CMakeLists.txt index e7ba218d3f..2fe859b18e 100644 --- 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() diff --git a/src/Mod/Cloud/App/CMakeLists.txt b/src/Mod/Cloud/App/CMakeLists.txt index 4803840fc1..b51c5e0030 100644 --- 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} diff --git a/src/Mod/Cloud/Gui/CMakeLists.txt b/src/Mod/Cloud/Gui/CMakeLists.txt index 86458e169c..38f88e580f 100644 --- 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 diff --git a/src/Mod/Draft/App/CMakeLists.txt b/src/Mod/Draft/App/CMakeLists.txt index f28aafc4f1..d5dacbb70d 100644 --- 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} diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt index 6003719af9..450a9a33cb 100644 --- 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}) diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index 428212846d..ea733dcaf5 100644 --- 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} diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index 1be47f18b4..882c069c33 100644 --- 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} diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 7ebbebde6e..01d44af6e6 100755 --- 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} ) diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index 6d9c7d83bf..bd591719d8 100644 --- 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} ) diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt index 408cb0bdf6..e4d9b13d2a 100644 --- 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}) diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index ecb3027692..04fc459823 100644 --- 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} diff --git a/src/Mod/Inspection/Gui/CMakeLists.txt b/src/Mod/Inspection/Gui/CMakeLists.txt index b2a52f8fe4..1cff524ee9 100644 --- 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} diff --git a/src/Mod/JtReader/App/CMakeLists.txt b/src/Mod/JtReader/App/CMakeLists.txt index 2a9ec8b999..6a0b292ba8 100644 --- 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}) diff --git a/src/Mod/Material/App/CMakeLists.txt b/src/Mod/Material/App/CMakeLists.txt index 63d134bad8..79ee5facef 100644 --- 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} diff --git a/src/Mod/Material/Gui/CMakeLists.txt b/src/Mod/Material/Gui/CMakeLists.txt index b090ae65f6..ae83e09296 100644 --- 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} diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index fe9d0df3f5..c804e7cf24 100644 --- 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}) diff --git a/src/Mod/Measure/Gui/CMakeLists.txt b/src/Mod/Measure/Gui/CMakeLists.txt index e2bb647989..a65953c39a 100644 --- 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} ) diff --git a/src/Mod/Mesh/App/CMakeLists.txt b/src/Mod/Mesh/App/CMakeLists.txt index 3bbd520fda..5acc8a3765 100644 --- 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} diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt index 39669663ac..8d836ac8a9 100644 --- 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} diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index 1de85a436e..5d25cadc2d 100644 --- 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}) diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt index ff9a7bd593..e51c7dc524 100644 --- 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}) diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index 1267471897..06ab730b14 100644 --- 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} diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index eecfa71816..8b1f0433df 100644 --- 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} diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index d0f14063a4..214520ebcd 100644 --- 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/ diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index 2841861cc3..b77fad9488 100644 --- 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} diff --git a/src/Mod/Points/App/CMakeLists.txt b/src/Mod/Points/App/CMakeLists.txt index aa3ac390fc..4c87eeb9bb 100644 --- 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} diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt index 8039be33be..8903007a23 100644 --- 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} diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index e6c8c39378..229ce9b9f7 100644 --- 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} diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 03e961b62d..637d53861c 100644 --- 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} diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index 184979834a..ebb43a40cd 100644 --- 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} diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index 486ade9eab..d0fce64622 100644 --- 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}) diff --git a/src/Mod/Sandbox/App/CMakeLists.txt b/src/Mod/Sandbox/App/CMakeLists.txt index 7b3b8b59be..6f6438f3f6 100644 --- 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} ) diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index 6815d025f5..6a5a56e4e2 100644 --- 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} diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt index cedc0a3cc2..3eec59b1fe 100644 --- 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} ) diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index 0491314339..9c27982c9c 100644 --- 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} diff --git a/src/Mod/Spreadsheet/App/CMakeLists.txt b/src/Mod/Spreadsheet/App/CMakeLists.txt index 0546cb7fd8..1ae0be3b9f 100644 --- 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} diff --git a/src/Mod/Spreadsheet/Gui/CMakeLists.txt b/src/Mod/Spreadsheet/Gui/CMakeLists.txt index 5680e1b7bc..756691883e 100644 --- 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} ) diff --git a/src/Mod/Start/App/CMakeLists.txt b/src/Mod/Start/App/CMakeLists.txt index 9c3edf1b93..992fad97de 100644 --- 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} ) diff --git a/src/Mod/Start/Gui/CMakeLists.txt b/src/Mod/Start/Gui/CMakeLists.txt index ea7c1c5d43..9ebf93cbf5 100644 --- 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} diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt index ea9160c3a7..1fdb81631a 100644 --- 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} diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt index 86f2acb2bf..fc26cf7c1b 100644 --- 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} ) diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index 2c5bb8c15f..c6a356cd2b 100644 --- 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} ) diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index 472866dc25..c82ea44df3 100644 --- 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} diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt index adcb0c865b..e6321f5f7c 100644 --- 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} ) diff --git a/src/Mod/Web/App/CMakeLists.txt b/src/Mod/Web/App/CMakeLists.txt index f53a7ef032..f2d5ee9a69 100644 --- 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} ) diff --git a/src/Tools/_TEMPLATE_/App/CMakeLists.txt b/src/Tools/_TEMPLATE_/App/CMakeLists.txt index 298b7115ce..144ac470a8 100644 --- 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} ) diff --git a/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt b/src/Tools/_TEMPLATE_/Gui/CMakeLists.txt index 5e1fee6d3f..d8b101bbdc 100644 --- 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} ) diff --git a/src/Tools/embedded/Qt/cxx/CMakeLists.txt b/src/Tools/embedded/Qt/cxx/CMakeLists.txt index 12770ec85e..2f383a4cb5 100644 --- 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} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 826bfa4251..ef6767c9d8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -46,7 +46,7 @@ endif(WIN32) if(NOT BUILD_DYNAMIC_LINK_PYTHON) list(APPEND Google_Tests_LIBS - ${PYTHON_LIBRARIES} + ${Python3_LIBRARIES} ) endif() @@ -63,7 +63,7 @@ function(setup_qt_test) if(NOT BUILD_DYNAMIC_LINK_PYTHON) list(APPEND ${_testname}_LIBS - ${PYTHON_LIBRARIES} + ${Python3_LIBRARIES} ) endif()