mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-21 19:03:28 +00:00
30edd37b7camend comment for CMAKE_QA_COMPAT_SKIP find PkgConfig each time it's needed (fix configure w/ qt-6.10) Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr> Part-of: https://github.com/gentoo/gentoo/pull/44297 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
27 lines
903 B
Diff
27 lines
903 B
Diff
unbundle pugixml
|
|
--- a/src/framework/global/CMakeLists.txt
|
|
+++ b/src/framework/global/CMakeLists.txt
|
|
@@ -150,9 +150,6 @@ set(MODULE_SRC
|
|
${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h
|
|
${CMAKE_CURRENT_LIST_DIR}/serialization/xmldom.cpp
|
|
${CMAKE_CURRENT_LIST_DIR}/serialization/xmldom.h
|
|
-
|
|
- ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml/pugixml.hpp
|
|
- ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml/pugixml.cpp
|
|
)
|
|
|
|
if (MUSE_THREADS_SUPPORT)
|
|
@@ -274,9 +271,10 @@ else ()
|
|
set(Z_LIB z)
|
|
endif ()
|
|
|
|
-list(APPEND MODULE_INCLUDE_PRIVATE
|
|
- ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml
|
|
-)
|
|
+find_package(PkgConfig REQUIRED)
|
|
+pkg_check_modules(pugixml REQUIRED IMPORTED_TARGET pugixml)
|
|
+list(APPEND MODULE_LINK PkgConfig::pugixml)
|
|
+list(APPEND MODULE_INCLUDE_PRIVATE ${pugixml_INCLUDE_DIRS})
|
|
|
|
list(APPEND MODULE_INCLUDE_PRIVATE ${Z_INCLUDE})
|
|
list(APPEND MODULE_LINK ${Z_LIB})
|