Эх сурвалжийг харах

#IQRV #comment [CompileErrorFix] PluseAudio 编译依赖

gifur 4 жил өмнө
parent
commit
e8bd9de72b

+ 10 - 0
Module/mod_mediacontroller/CMakeLists.txt

@@ -45,6 +45,8 @@ conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 else(WIN32)
+conan_cmake_run(REQUIRES pulseaudio/14.0.1@LR04.02_ThirdParty/dynamic
+BASIC_SETUP CMAKE_TARGETS)
 endif(WIN32)
 
 
@@ -100,6 +102,14 @@ BUILD missing)
 endif(WIN32)
 
 
+if(NOT WIN32)
+target_include_directories(${MODULE_NAME} PRIVATE
+${CONAN_INCLUDE_DIRS_PULSEAUDIO})
+target_link_directories(${MODULE_NAME} PRIVATE
+	${CONAN_LIB_DIRS_PULSEAUDIO}
+	)
+endif(NOT WIN32)
+
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	if(WIN32)

+ 12 - 0
Module/mod_sipphone/CMakeLists.txt

@@ -76,6 +76,8 @@ conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 else(WIN32)
+conan_cmake_run(REQUIRES pulseaudio/14.0.1@LR04.02_ThirdParty/dynamic
+BASIC_SETUP CMAKE_TARGETS)
 endif(WIN32)
 
 
@@ -125,6 +127,10 @@ spandsp/0.0.6@LR04.02_ThirdParty/testing
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 
+if(NOT WIN32)
+	target_include_directories(${MODULE_NAME} PRIVATE
+	${CONAN_INCLUDE_DIRS_PULSEAUDIO})
+endif(NOT WIN32)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_APR}/apr-1
@@ -175,6 +181,12 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	endif(WIN32)
 )
 
+if(NOT WIN32)
+target_link_directories(${MODULE_NAME} PRIVATE
+	${CONAN_LIB_DIRS_PULSEAUDIO}
+	)
+endif(NOT WIN32)
+
 
 # 添加实体需要依赖的其他共享库(包括系统库)
 if(WIN32)

+ 1 - 2
Other/libaudioframework/CMakeLists.txt

@@ -191,8 +191,7 @@ BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 else(WIN32)
 conan_cmake_run(REQUIRES pulseaudio/14.0.1@LR04.02_ThirdParty/dynamic
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
+BASIC_SETUP CMAKE_TARGETS)
 endif(WIN32)
 
 if(WIN32)

+ 4 - 6
Other/libaudiomgr/CMakeLists.txt

@@ -22,13 +22,10 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
-if(WIN32)
-else(WIN32)
+if(NOT WIN32)
 conan_cmake_run(REQUIRES pulseaudio/14.0.1@LR04.02_ThirdParty/dynamic
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
+BASIC_SETUP CMAKE_TARGETS)
+endif(NOT WIN32)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
@@ -44,6 +41,7 @@ if(WIN32)
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS} 
 )
 else(WIN32)
+message(STATUS "CONAN_INCLUDE_DIRS_PULSEAUDIO ${CONAN_INCLUDE_DIRS_PULSEAUDIO}")
 message(STATUS "CONAN_LIB_DIRS_PULSEAUDIO ${CONAN_LIB_DIRS_PULSEAUDIO}")
 message(STATUS "CONAN_PKG_LIBS_PULSEAUDIO ${CONAN_PKG_LIBS_PULSEAUDIO}")
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS}

+ 2 - 2
Other/rvcaudiomgr/CMakeLists.txt

@@ -12,11 +12,11 @@ set(${MODULE_PREFIX}_SRCS
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	
+	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
 )
 
 target_link_directories(${MODULE_NAME} PRIVATE
-
+    ${CONAN_LIB_DIRS_PULSEAUDIO}
 )
 
 # 添加实体需要依赖的其他共享库(包括系统库)