{humble} qt-gui-cpp: Use CMake for tinyxml2

Signed-off-by: Rob Woolley <[email protected]>

Author: robwoolley

meta-ros2-humble/recipes-bbappends/qt-gui-core/qt-gui-cpp/use-cmake-target-libraries-for-tinyxml2.patch

@@ -0,0 +1,31 @@
+This uses the CMake config variables for libraries instead of the generator.
+
+The generator approach was resulting in TARGET_FILE:tinyxml2::tinyxml2 appearing
+directly in the generated pyproject.toml and libqt_gui_cpp_sip.pro files.
+
+Commenting out this line avoids TinyXML2_LIBRARIES being fed into a loop that
+adds TARGET_FILE:tinyxml2::tinyxml2. The tinyxml2 library path is already present
+in deps_libraries.
+
+Eventually, pip install was invoked which called QMake then Make.  The linker
+did not like it and would fail.
+
+This resulted in pip reporting "error: subprocess-exited-with-error"
+
+Signed-off-by: Rob Woolley <[email protected]>
+
+Upstream-Status: Pending
+
+Index: git/src/qt_gui_cpp_sip/CMakeLists.txt
+===================================================================
+--- git.orig/src/qt_gui_cpp_sip/CMakeLists.txt
++++ git/src/qt_gui_cpp_sip/CMakeLists.txt
+@@ -33,7 +33,7 @@ set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gu
+ 
+ ament_get_recursive_properties(deps_include_dirs deps_libraries ${pluginlib_TARGETS})
+ list(APPEND deps_include_dirs ${TinyXML2_INCLUDE_DIRS})
+-list(APPEND deps_libraries ${TinyXML2_LIBRARIES})
++# list(APPEND deps_libraries ${TinyXML2_LIBRARIES})
+ 
+ find_package(Python3 REQUIRED COMPONENTS Development)
+ 

meta-ros2-humble/recipes-bbappends/qt-gui-core/qt-gui-cpp_2.2.4-1.bbappend

@@ -12,7 +12,8 @@ DEPENDS += "python3-pip-native"
 export SIP_PROJECT_INCLUDE_DIRS = "${STAGING_DIR_TARGET}/${libdir}/${PYTHON_DIR}/site-packages/PyQt5/bindings"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-SRC_URI += "file://use-cmake-target-libraries.patch"
+SRC_URI += "file://use-cmake-target-libraries.patch \
+            file://use-cmake-target-libraries-for-tinyxml2.patch"
 
 # This is needed to set OE_QMAKE_PATH_EXTERNAL_HOST_BINS to resolve:
 # | -- Found PythonLibs: ros2-foxy-dunfell/tmp-glibc/work/core2-64-oe-linux/qt-gui-cpp/1.0.8-1-r0/recipe-sysroot/usr/lib/libpython3.8.so (found suitable version "3.8.2", minimum required is "3.8")