From 612d7b541c31ff8f045e5269f2617d90374dc691 Mon Sep 17 00:00:00 2001 From: marioalexis Date: Wed, 26 Feb 2025 14:22:03 -0300 Subject: [PATCH 1/3] CMake: Fix PySide major version comparison --- cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake index 45c10fc2f4..778225d4a4 100644 --- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake +++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake @@ -59,7 +59,7 @@ macro(SetupShibokenAndPyside) find_package(PySide${PYSIDE_MAJOR_VERSION} QUIET) - if(${PYSIDE_MAJOR_VERSION} EQUAL 5) + if(${PYSIDE_MAJOR_VERSION} EQUAL 2) # Our internal FindPySide6.cmake file already provides these for PySide6 if(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide${PYSIDE_MAJOR_VERSION}::pyside${PYSIDE_MAJOR_VERSION}) get_property(PYSIDE_INCLUDE_DIR TARGET PySide${PYSIDE_MAJOR_VERSION}::pyside${PYSIDE_MAJOR_VERSION} PROPERTY INTERFACE_INCLUDE_DIRECTORIES) From b0a3fe749d0e357e7b04ded68f7858b8a0227058 Mon Sep 17 00:00:00 2001 From: marioalexis Date: Wed, 26 Feb 2025 14:23:49 -0300 Subject: [PATCH 2/3] CMake: Fix PySide6 search --- cMake/FindPySide6.cmake | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cMake/FindPySide6.cmake b/cMake/FindPySide6.cmake index 8f97f0ec4c..847fef3ee0 100644 --- a/cMake/FindPySide6.cmake +++ b/cMake/FindPySide6.cmake @@ -4,17 +4,13 @@ # cMake find_package() call find_package(PySide6 CONFIG QUIET) -if(NOT PySide6_FOUND) - if(NOT PySide6_INCLUDE_DIRS AND TARGET PySide6::pyside6) - get_property(PySide6_INCLUDE_DIRS TARGET PySide6::pyside6 PROPERTY INTERFACE_INCLUDE_DIRECTORIES) - endif() - if(NOT PySide6_INCLUDE_DIRS) - find_pip_package(PySide6) - else() - set(PySide6_FOUND ON) - endif() +if(NOT PySide6_INCLUDE_DIRS AND TARGET PySide6::pyside6) + get_property(PySide6_INCLUDE_DIRS TARGET PySide6::pyside6 PROPERTY INTERFACE_INCLUDE_DIRECTORIES) +endif() +if(NOT PySide6_INCLUDE_DIRS) + find_pip_package(PySide6) endif() # Also provide the old-style variables so we don't have to update everything yet From 50a460523299e1751eb75a44ac94e17c80102164 Mon Sep 17 00:00:00 2001 From: marioalexis Date: Wed, 26 Feb 2025 14:24:50 -0300 Subject: [PATCH 3/3] CMake: Add FREECAD_USE_PYSIDE and FREECAD_USE_SHIBOKEN to final report --- cMake/FreeCAD_Helpers/PrintFinalReport.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake index 1f1cbe86b3..14cf57bd89 100644 --- a/cMake/FreeCAD_Helpers/PrintFinalReport.cmake +++ b/cMake/FreeCAD_Helpers/PrintFinalReport.cmake @@ -89,6 +89,8 @@ macro(PrintFinalReport) value(FREECAD_CREATE_MAC_APP) value(FREECAD_USE_PYBIND11) value(FREECAD_USE_EXTERNAL_KDL) + value(FREECAD_USE_PYSIDE) + value(FREECAD_USE_SHIBOKEN) value(BUILD_ADDONMGR) value(BUILD_BIM) value(BUILD_ASSEMBLY)