Merge pull request #19875 from marioalexis84/cmake-find_pyside

CMake: Fix PySide search

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

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)

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)