1 files changed, 44 insertions, 27 deletions

diff --git a/sources/shiboken6/libshiboken/CMakeLists.txt b/sources/shiboken6/libshiboken/CMakeLists.txt
index eaed2ef72..b5bbb498a 100644
--- a/sources/shiboken6/libshiboken/CMakeLists.txt
+++ b/sources/shiboken6/libshiboken/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
+
 project(libshiboken)
 
 option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE)
@@ -27,7 +30,7 @@ if(SHIBOKEN_IS_CROSS_BUILD)
     set(host_python_path "${QFP_PYTHON_HOST_PATH}")
     set(use_pyc_in_embedding FALSE)
 else()
-    set(host_python_path "${PYTHON_EXECUTABLE}")
+    set(host_python_path "${Python_EXECUTABLE}")
     if(PYTHON_LIMITED_API)
         set(use_pyc_in_embedding FALSE)
     else()
@@ -55,39 +58,49 @@ set(libshiboken_VERSION "${libshiboken_MAJOR_VERSION}.${libshiboken_MINOR_VERSIO
 set(libshiboken_SOVERSION "${shiboken6_library_so_version}")
 
 set(libshiboken_SRC
-basewrapper.cpp
-debugfreehook.cpp
-gilstate.cpp
-helper.cpp
-sbkarrayconverter.cpp
-sbkcontainer.cpp
-sbkconverter.cpp
-sbkenum.cpp
-sbkerrors.cpp
-sbkfeature_base.cpp
-sbkmodule.cpp
-sbknumpy.cpp
-sbkcppstring.cpp
-sbkstring.cpp
-sbkstaticstrings.cpp
-sbktypefactory.cpp
-bindingmanager.cpp
-threadstatesaver.cpp
-shibokenbuffer.cpp
-pep384impl.cpp
-voidptr.cpp
-bufferprocs_py37.cpp
+autodecref.h
+basewrapper.cpp basewrapper.h basewrapper_p.h
+bindingmanager.cpp bindingmanager.h
+bufferprocs_py37.cpp bufferprocs_py37.h
+debugfreehook.cpp debugfreehook.h
+gilstate.cpp gilstate.h
+helper.cpp helper.h
+pep384impl.cpp pep384impl.h
+pyobjectholder.h
+sbkarrayconverter.cpp sbkarrayconverter.h sbkarrayconverter_p.h
+sbkcontainer.cpp sbkcontainer.h
+sbkconverter.cpp sbkconverter.h sbkconverter_p.h
+sbkcppstring.cpp sbkcppstring.h sbkcpptonumpy.h
+sbkenum.cpp sbkenum.h
+sbkerrors.cpp sbkerrors.h
+sbkfeature_base.cpp sbkfeature_base.h
+sbkmodule.cpp sbkmodule.h
+sbknumpy.cpp sbknumpycheck.h
+sbknumpyview.h
+sbkpython.h
+sbksmartpointer.cpp sbksmartpointer.h
+sbkstaticstrings.cpp sbkstaticstrings.h sbkstaticstrings_p.h
+sbkstring.cpp sbkstring.h
+sbktypefactory.cpp sbktypefactory.h
+sbkwindows.h
+shiboken.h
+shibokenbuffer.cpp shibokenbuffer.h
+shibokenmacros.h
+threadstatesaver.cpp threadstatesaver.h
+voidptr.cpp voidptr.h
 
 embed/signature_bootstrap_inc.h
 embed/signature_inc.h
 
-signature/signature.cpp
+signature/signature.cpp signature.h signature_p.h
 signature/signature_globals.cpp
 signature/signature_extend.cpp
 signature/signature_helper.cpp
 )
 
-set(APIEXTRACTOR_EXTRA_INCLUDES ${APIEXTRACTOR_EXTRA_INCLUDES} ${LIBXSLT_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
+# This is needed to let the header obey a variable in "pep384impl.h".
+# Note: This must be set on the cpp file!
+set_property(SOURCE "pep384impl.cpp" PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
 
 add_library(libshiboken SHARED ${libshiboken_SRC})
 add_library(Shiboken6::libshiboken ALIAS libshiboken)
@@ -146,11 +159,12 @@ install(FILES
         bindingmanager.h
         gilstate.h
         helper.h
+        pyobjectholder.h
         sbkarrayconverter.h
         sbkcontainer.h
         sbkconverter.h
+        sbkcpptonumpy.h
         sbkenum.h
-        sbkenum_p.h
         sbkerrors.h
         sbkfeature_base.h
         sbkmodule.h
@@ -158,6 +172,7 @@ install(FILES
         sbknumpyview.h
         sbkstring.h
         sbkcppstring.h
+        sbksmartpointer.h
         sbkstaticstrings.h
         sbktypefactory.h
         shiboken.h
@@ -165,7 +180,9 @@ install(FILES
         threadstatesaver.h
         shibokenbuffer.h
         sbkpython.h
+        sbkwindows.h
         pep384impl.h
+        pep384ext.h
         voidptr.h
         bufferprocs_py37.h
         "${CMAKE_CURRENT_BINARY_DIR}/sbkversion.h"
@@ -179,4 +196,4 @@ install(TARGETS libshiboken EXPORT Shiboken6Targets
                             ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
                             RUNTIME DESTINATION bin)
 install(EXPORT Shiboken6Targets NAMESPACE Shiboken6::
-        DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6-${shiboken6_VERSION})
+        DESTINATION ${LIB_INSTALL_DIR}/cmake/Shiboken6)