diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-05-29 12:35:27 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-05-29 12:35:27 +0800 |
| commit | d046d7e0e1e3ccbffb42d22fe52aa73d0c170b8e (patch) | |
| tree | 7c2023e55955c9aed55db9331bae164a386a2d21 /indra/cmake/Audio.cmake | |
| parent | 6641e36082f27faa282a0af6f88f381ffc97e179 (diff) | |
| parent | 11d75418fce8372e9976b069070d9d0506766d0d (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/cmake/Audio.cmake')
| -rw-r--r-- | indra/cmake/Audio.cmake | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake index 514d283e76..c569fba4e8 100644 --- a/indra/cmake/Audio.cmake +++ b/indra/cmake/Audio.cmake @@ -5,14 +5,12 @@ include(Prebuilt) include_guard() add_library( ll::vorbis INTERFACE IMPORTED ) -if (USESYSTEMLIBS) - include(FindPkgConfig) - pkg_check_modules(Vorbis REQUIRED ogg vorbis vorbisenc vorbisfile) - target_include_directories(ll::vorbis SYSTEM INTERFACE ${Vorbis_INCLUDE_DIRS}) - target_link_directories(ll::vorbis INTERFACE ${Vorbis_LIBRARY_DIRS}) - target_link_libraries(ll::vorbis INTERFACE ${Vorbis_LIBRARIES}) - return () -endif () +include(FindPkgConfig) +pkg_check_modules(Vorbis REQUIRED ogg vorbis vorbisenc vorbisfile) +target_include_directories(ll::vorbis SYSTEM INTERFACE ${Vorbis_INCLUDE_DIRS}) +target_link_directories(ll::vorbis INTERFACE ${Vorbis_LIBRARY_DIRS}) +target_link_libraries(ll::vorbis INTERFACE ${Vorbis_LIBRARIES}) +return () use_system_binary(vorbis) use_prebuilt_binary(ogg_vorbis) |