Skip to content

Commit c7211d5

Browse files
committed
detect asound after sysroot installation
1 parent 1d3a97c commit c7211d5

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

CMakeLists.txt

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ if (DEFINED CMAKE_SYSROOT)
3636
endif()
3737
MESSAGE("CMAKE_SYSROOT = ${CMAKE_SYSROOT} CMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}")
3838

39-
# alsa ?
40-
find_package(ALSA QUIET)
41-
MESSAGE("ALSA_FOUND = ${ALSA_FOUND}")
42-
43-
# pulse ?
44-
find_package(PulseAudio QUIET)
45-
MESSAGE("PulseAudio_FOUND = ${PulseAudio_FOUND}")
4639

4740
set(ENV{PATH} "${WEBRTCROOT}/src/third_party/llvm-build/Release+Asserts/bin:$ENV{PATH}")
4841
MESSAGE("PATH = $ENV{PATH}")
@@ -92,6 +85,15 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
9285
endif()
9386
endif()
9487

88+
89+
# alsa ?
90+
find_package(ALSA QUIET)
91+
MESSAGE("ALSA_FOUND = ${ALSA_FOUND}")
92+
93+
# pulse ?
94+
find_package(PulseAudio QUIET)
95+
MESSAGE("PulseAudio_FOUND = ${PulseAudio_FOUND}")
96+
9597
set (WEBRTCARGS rtc_include_tests=false\nrtc_enable_protobuf=false\nrtc_build_examples=false\ntreat_warnings_as_errors=false\nenable_js_protobuf=false\nuse_glib=false\n)
9698
set (WEBRTCARGS libyuv_use_sme=false\n${WEBRTCARGS})
9799
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT WIN32)
@@ -273,6 +275,10 @@ if (EXISTS ${WEBRTCOBJS}/buildtools/third_party/libc++abi/${CMAKE_STATIC_LIBRARY
273275
target_link_libraries(${CMAKE_PROJECT_NAME} "${WEBRTCOBJS}/buildtools/third_party/libc++abi/${CMAKE_STATIC_LIBRARY_PREFIX}c++abi${CMAKE_STATIC_LIBRARY_SUFFIX}")
274276
endif()
275277

278+
# alsa ?
279+
find_package(ALSA QUIET)
280+
MESSAGE("ALSA_FOUND = ${ALSA_FOUND}")
281+
276282
# cxxopts
277283
target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE cxxopts/include)
278284
target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE CXXOPTS_NO_RTTI)

0 commit comments

Comments
 (0)