diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
index 7082116d3e..18a8d01d70 100644
--- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
+++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
@@ -45,29 +45,27 @@ macro(SetupShibokenAndPyside)
 
         # pyside2 changed it's cmake files, this is the dance we have
         # to dance to be compatible with the old (<5.12) and the new versions (>=5.12)
-        if(NOT SHIBOKEN_LIBRARY AND TARGET Shiboken2::libshiboken)
-                get_property(SHIBOKEN_LIBRARY TARGET Shiboken2::libshiboken PROPERTY IMPORTED_LOCATION_RELEASE)
+        if(NOT SHIBOKEN_INCLUDE_DIR AND TARGET Shiboken2::libshiboken)
                 get_property(SHIBOKEN_INCLUDE_DIR TARGET Shiboken2::libshiboken PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-        endif(NOT SHIBOKEN_LIBRARY AND TARGET Shiboken2::libshiboken)
+        endif(NOT SHIBOKEN_INCLUDE_DIR AND TARGET Shiboken2::libshiboken)
 
-        if(NOT SHIBOKEN_LIBRARY AND NOT SHIBOKEN_INCLUDE_DIR)
+        if(NOT SHIBOKEN_INCLUDE_DIR)
             message("====================\n"
                     "shiboken2 not found.\n"
                     "====================\n")
-        endif(NOT SHIBOKEN_LIBRARY AND NOT SHIBOKEN_INCLUDE_DIR)
+        endif(NOT SHIBOKEN_INCLUDE_DIR)
 
         find_package(PySide2 QUIET)# REQUIRED
 
-        if(NOT PYSIDE_LIBRARY AND TARGET PySide2::pyside2)
-                get_property(PYSIDE_LIBRARY TARGET PySide2::pyside2 PROPERTY IMPORTED_LOCATION_RELEASE)
+        if(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide2::pyside2)
                 get_property(PYSIDE_INCLUDE_DIR TARGET PySide2::pyside2 PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
-        endif(NOT PYSIDE_LIBRARY AND TARGET PySide2::pyside2)
+        endif(NOT PYSIDE_INCLUDE_DIR AND TARGET PySide2::pyside2)
 
-        if(NOT PYSIDE_LIBRARY AND NOT PYSIDE_INCLUDE_DIR)
+        if(NOT PYSIDE_INCLUDE_DIR)
             message("==================\n"
                     "PySide2 not found.\n"
                     "==================\n")
-        endif(NOT PYSIDE_LIBRARY AND NOT PYSIDE_INCLUDE_DIR)
+        endif(NOT PYSIDE_INCLUDE_DIR)
 
         find_package(PySide2Tools QUIET) #REQUIRED # PySide2 utilities (pyside2-uic & pyside2-rcc)
         if(NOT PYSIDE2_TOOLS_FOUND)
diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt
index 00b18945b0..1eec492b3f 100644
--- a/src/Gui/CMakeLists.txt
+++ b/src/Gui/CMakeLists.txt
@@ -180,15 +180,17 @@ if(SHIBOKEN_INCLUDE_DIR)
     include_directories(
         ${SHIBOKEN_INCLUDE_DIR}
     )
-    #if (TARGET Shiboken2::libshiboken)
-    #    list(APPEND FreeCADGui_LIBS
-    #        Shiboken2::libshiboken
-    #    )
-    #else(TARGET Shiboken2::libshiboken)
+    if (SHIBOKEN_LIBRARY)
         list(APPEND FreeCADGui_LIBS
             ${SHIBOKEN_LIBRARY}
         )
-    #endif(TARGET Shiboken2::libshiboken)
+    else (SHIBOKEN_LIBRARY)
+        if (TARGET Shiboken2::libshiboken)
+            list(APPEND FreeCADGui_LIBS
+                Shiboken2::libshiboken
+            )
+        endif (TARGET Shiboken2::libshiboken)
+    endif (SHIBOKEN_LIBRARY)
 endif(SHIBOKEN_INCLUDE_DIR)
 
 if(PYSIDE_INCLUDE_DIR)
@@ -197,15 +199,17 @@ if(PYSIDE_INCLUDE_DIR)
         ${PYSIDE_INCLUDE_DIR}/QtCore
         ${PYSIDE_INCLUDE_DIR}/QtGui
     )
-    #if (TARGET PySide2::pyside2)
-    #    list(APPEND FreeCADGui_LIBS
-    #        PySide2::pyside2
-    #    )
-    #else(TARGET PySide2::pyside2)
+    if (PYSIDE_LIBRARY)
         list(APPEND FreeCADGui_LIBS
             ${PYSIDE_LIBRARY}
         )
-    #endif(TARGET PySide2::pyside2)
+    else (PYSIDE_LIBRARY)
+        if (TARGET PySide2::pyside2)
+            list(APPEND FreeCADGui_LIBS
+                PySide2::pyside2
+            )
+        endif (TARGET PySide2::pyside2)
+    endif (PYSIDE_LIBRARY)
     if (BUILD_QT5)
         include_directories(
             ${PYSIDE_INCLUDE_DIR}/QtWidgets