3 files changed, 36 insertions, 20 deletions
diff --git a/sources/pyside6/cmake/Macros/PySideModules.cmake b/sources/pyside6/cmake/Macros/PySideModules.cmake
index 08b2127ed..cca66be8e 100644
--- a/sources/pyside6/cmake/Macros/PySideModules.cmake
+++ b/sources/pyside6/cmake/Macros/PySideModules.cmake
@@ -126,7 +126,12 @@ macro(create_pyside_module)
         install(FILES ${module_GLUE_SOURCES} DESTINATION share/PySide6${pyside6_SUFFIX}/typesystems/glue)
     endif()
 
-    set(shiboken_command Shiboken6::shiboken6 ${GENERATOR_EXTRA_FLAGS}
+    shiboken_get_tool_shell_wrapper(shiboken tool_wrapper)
+
+    set(shiboken_command
+        ${tool_wrapper}
+        $<TARGET_FILE:Shiboken6::shiboken6>
+        ${GENERATOR_EXTRA_FLAGS}
         "--include-paths=${shiboken_include_dirs}"
         "--typesystem-paths=${pyside_binary_dir}${PATH_SEP}${pyside6_SOURCE_DIR}${PATH_SEP}${${module_TYPESYSTEM_PATH}}"
         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
diff --git a/sources/pyside6/doc/CMakeLists.txt b/sources/pyside6/doc/CMakeLists.txt
index 2f64952de..6fb492973 100644
--- a/sources/pyside6/doc/CMakeLists.txt
+++ b/sources/pyside6/doc/CMakeLists.txt
@@ -213,21 +213,27 @@ configure_file("conf.py.in" "rst/conf.py" @ONLY)
 
 set(CODE_SNIPPET_ROOT "${CMAKE_CURRENT_BINARY_DIR}/rst/codesnippets")
 
+shiboken_get_tool_shell_wrapper(shiboken tool_wrapper)
+
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/rst/PySide6/QtCore/index.rst"
-                   COMMAND Shiboken6::shiboken6 --generator-set=qtdoc ${global_header}
-                           --enable-pyside-extensions
-                           --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside6_SOURCE_DIR}${PATH_SEP}${TS_ROOT}"
-                           --api-version=${SUPPORTED_QT_VERSION}
-                           --typesystem-paths="${QDOC_TYPESYSTEM_PATH}"
-                           --library-source-dir=${QT_SRC_DIR}
-                           --documentation-data-dir=${DOC_DATA_DIR}/webxml
-                           --output-directory=${CMAKE_CURRENT_BINARY_DIR}/rst
-                           --documentation-code-snippets-dir=${CODE_SNIPPET_ROOT}
-                           --snippets-path-rewrite=${QT_ROOT_PATH}:${CODE_SNIPPET_ROOT}
-                           --documentation-extra-sections-dir=${CMAKE_CURRENT_BINARY_DIR}/rst/extras
-                           --additional-documentation=${CMAKE_CURRENT_BINARY_DIR}/rst/additionaldocs.lst
-                           --inheritance-file=${ENV_INHERITANCE_FILE}
-                           ${global_typesystem}
+                   COMMAND
+                       ${tool_wrapper}
+                       $<TARGET_FILE:Shiboken6::shiboken6>
+                       --generator-set=qtdoc
+                       ${global_header}
+                       --enable-pyside-extensions
+                       --include-paths="${QT_INCLUDE_DIR}${PATH_SEP}${pyside6_SOURCE_DIR}${PATH_SEP}${TS_ROOT}"
+                       --api-version=${SUPPORTED_QT_VERSION}
+                       --typesystem-paths="${QDOC_TYPESYSTEM_PATH}"
+                       --library-source-dir=${QT_SRC_DIR}
+                       --documentation-data-dir=${DOC_DATA_DIR}/webxml
+                       --output-directory=${CMAKE_CURRENT_BINARY_DIR}/rst
+                       --documentation-code-snippets-dir=${CODE_SNIPPET_ROOT}
+                       --snippets-path-rewrite=${QT_ROOT_PATH}:${CODE_SNIPPET_ROOT}
+                       --documentation-extra-sections-dir=${CMAKE_CURRENT_BINARY_DIR}/rst/extras
+                       --additional-documentation=${CMAKE_CURRENT_BINARY_DIR}/rst/additionaldocs.lst
+                       --inheritance-file=${ENV_INHERITANCE_FILE}
+                       ${global_typesystem}
                    WORKING_DIRECTORY ${${module}_SOURCE_DIR}
                    COMMENT "Running generator to generate documentation...")
 
diff --git a/sources/pyside6/tests/pysidetest/CMakeLists.txt b/sources/pyside6/tests/pysidetest/CMakeLists.txt
index 81fae5084..e88b866c4 100644
--- a/sources/pyside6/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside6/tests/pysidetest/CMakeLists.txt
@@ -73,10 +73,15 @@ make_path(testbinding_include_dirs  ${pyside6_BINARY_DIR}
 make_path(testbinding_typesystem_path ${pyside6_SOURCE_DIR}
                                       ${pyside6_BINARY_DIR})
 
+shiboken_get_tool_shell_wrapper(shiboken tool_wrapper)
+
 add_custom_command(
-OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
-        BYPRODUCTS ${testbinding_SRC}
-        COMMAND Shiboken6::shiboken6 ${GENERATOR_EXTRA_FLAGS}
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
+    BYPRODUCTS ${testbinding_SRC}
+    COMMAND
+        ${tool_wrapper}
+        $<TARGET_FILE:Shiboken6::shiboken6>
+        ${GENERATOR_EXTRA_FLAGS}
         ${CMAKE_CURRENT_SOURCE_DIR}/pysidetest_global.h
         --include-paths=${testbinding_include_dirs}
         ${shiboken_framework_include_dirs_option}
@@ -84,8 +89,8 @@ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/mjb_rejected_classes.log"
         --output-directory=${CMAKE_CURRENT_BINARY_DIR}
         ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_pysidetest.xml
         --api-version=${SUPPORTED_QT_VERSION}
-WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-COMMENT "Running generator for test binding..."
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "Running generator for test binding..."
 )
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}