mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-21 02:42:18 +00:00
1afa7a46b4rebased from live ebuild w/ backported patches and libsndfile still required. 4.6 branch supports pipewire CMAKE_QA_COMPAT_SKIP : CMakeLists.txt used are >=3.16 for upstream and 3.12 for KDDockWidgets Closes: https://bugs.gentoo.org/952950 Closes: https://bugs.gentoo.org/958256 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
940 B
Diff
27 lines
940 B
Diff
unbundle pugixml
|
|
--- a/src/framework/global/CMakeLists.txt
|
|
+++ b/src/framework/global/CMakeLists.txt
|
|
@@ -151,9 +151,6 @@ set(MODULE_SRC
|
|
${CMAKE_CURRENT_LIST_DIR}/serialization/msgpack.h
|
|
${CMAKE_CURRENT_LIST_DIR}/serialization/msgpack_forward.h
|
|
|
|
- ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml/pugixml.hpp
|
|
- ${CMAKE_CURRENT_LIST_DIR}/thirdparty/pugixml/pugixml.cpp
|
|
-
|
|
${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h
|
|
${CMAKE_CURRENT_LIST_DIR}/concurrency/concurrent.h
|
|
)
|
|
@@ -258,9 +255,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})
|