Z991239-6287 #comment 调整sipphone为动态库依赖

Module/mod_screenshot/CMakeLists.txt

@@ -43,9 +43,9 @@ target_include_directories(${MODULE_NAME} PRIVATE
 #	${CONAN_INCLUDE_DIRS_LIBX11})
 
 # 添加需要依赖的其他共享库（包括系统库）
-target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_OPENJPEG} 	${CONAN_LIB_DIRS_FFMPEG} ${CONAN_LIB_DIRS_ZLIB} ${CONAN_BIN_DIRS_OPENCV} ${CONAN_LIB_DIRS_OPENCV})
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_OPENJPEG} 	${CONAN_LIB_DIRS_FFMPEG} ${CONAN_LIB_DIRS_ZLIB})
 # 添加实体需要依赖的其他共享库（包括系统库）
-target_link_libraries(${MODULE_NAME} ${MODULE_BASE_LIBS} ${CONAN_PKG_LIBS_FFMPEG} libvideoframework libbizchan libscreencodec ${CONAN_PKG_LIBS_OPENJPEG} ${CONAN_LIBS_OPENCV} ${CONAN_PKG_LIBS_ZLIB} X11)
+target_link_libraries(${MODULE_NAME} ${MODULE_BASE_LIBS} ${CONAN_PKG_LIBS_FFMPEG} libvideoframework libbizchan libscreencodec ${CONAN_PKG_LIBS_OPENJPEG} ${CONAN_PKG_LIBS_ZLIB} X11)
 
 endif(WIN32)
 

Module/mod_sipphone/CMakeLists.txt

@@ -89,6 +89,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 message(STATUS "CONAN_INCLUDE_DIRS_SOFIA == ${CONAN_INCLUDE_DIRS_SOFIA}")
 message(STATUS "CONAN_LIB_DIRS_LIBYUV == ${CONAN_LIB_DIRS_LIBYUV}")
 
+
 if(MSVC)
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
@@ -108,7 +109,7 @@ else()
 target_link_directories(${MODULE_NAME} PRIVATE
     ${CONAN_LIB_DIRS_PULSEAUDIO}
 	${CONAN_LIB_DIRS_FFMPEG}
-	${CUSTOM_OPENCV_LIBS_DIR}
+	${CONAN_BIN_DIRS_OPENCV}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SOFIA}
 	${CONAN_LIB_DIRS_SPEEXDSP}
@@ -153,7 +154,7 @@ set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS}
 else(WIN32)
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS} 	
 	${CONAN_PKG_LIBS_FFMPEG}
-	${CONAN_LIBS_OPENCV}
+	opencv_highgui 
 	${SPBASE_LIB}
 	${TOOLKIT_LIB}
 	${CONAN_PKG_LIBS_APR}
@@ -185,5 +186,5 @@ deploy_module(${MODULE_PREFIX} ${MODULE_NAME})
 if(MSVC)
 	set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)
 else()
-	set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
+	set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} ${CONAN_BIN_DIRS_OPENCV} PARENT_SCOPE)
 endif(MSVC)