mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-12-21 02:42:18 +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>
16 lines
712 B
Diff
16 lines
712 B
Diff
unbundle lame
|
|
--- a/src/framework/audio/engine/audio_engine.cmake
|
|
+++ b/src/framework/audio/engine/audio_engine.cmake
|
|
@@ -185,8 +185,10 @@ if (MUSE_MODULE_AUDIO_EXPORT)
|
|
${CMAKE_CURRENT_LIST_DIR}/internal/export/wavencoder.h
|
|
)
|
|
|
|
- add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/../thirdparty/lame lame EXCLUDE_FROM_ALL)
|
|
- list(APPEND AUDIO_ENGINE_LINK lame)
|
|
+ find_package(PkgConfig REQUIRED)
|
|
+ pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame)
|
|
+ list(APPEND AUDIO_ENGINE_LINK PkgConfig::lame)
|
|
+ list(APPEND MODULE_INCLUDE_PRIVATE ${lame_INCLUDE_DIRS})
|
|
|
|
include(${CMAKE_CURRENT_LIST_DIR}/../cmake/SetupOpusEnc.cmake)
|
|
list(APPEND AUDIO_ENGINE_LINK ${LIBOPUSENC_TARGETS})
|