Z991239-5263 #comment 删除oldopencv库依赖

Module/mod_sipphone/CMakeLists.txt

@@ -12,18 +12,13 @@ else()
 	set(RVCCOMM_LIB RVCComm)
 endif(RVC_DEBUG_MODE)
 
-
-if(MSVC)
-	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OLDPENCV})
-	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OLDPENCV})
-	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OLDPENCV})
-
-    set(STDAFXCPP stdafx.cpp)
-else()
 	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
 	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
 	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
 
+if(MSVC)
+    set(STDAFXCPP stdafx.cpp)
+else()
 	set(STDAFXCPP )
 endif(MSVC)
 

Other/win/libaudioframework/CMakeLists.txt

@@ -12,15 +12,11 @@ else()
 	set(RVCCOMM_LIB RVCComm)
 endif(RVC_DEBUG_MODE)
 
-if(MSVC)
-	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OLDPENCV})
-	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OLDPENCV})
-	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OLDPENCV})
-else()
-	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
-	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
-	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
-endif(MSVC)
+
+set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
+set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
+set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
+
 
 set(${MODULE_PREFIX}_SRCS
 	audioaec.c

Other/win/libfacecapture/CMakeLists.txt

@@ -1,15 +1,11 @@
 set(MODULE_NAME "libfacecapture")
 set(MODULE_PREFIX "LIB_FACECAPTURE_FUNC")
 
-if(MSVC)
-	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OLDPENCV})
-	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OLDPENCV})
-	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OLDPENCV})
-else()
-	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
-	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
-	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
-endif(MSVC)
+
+set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
+set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
+set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
+
 
 set(${MODULE_PREFIX}_SRCS
 	libfacecapture.cpp

Other/win/libvideorecord/CMakeLists.txt

@@ -3,15 +3,9 @@ set(MODULE_PREFIX "LIBVIDEORECORD_FUNC")
 
 add_definitions(-D__STDC_CONSTANT_MACROS)
 
-if(MSVC)
-	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OLDPENCV})
-	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OLDPENCV})
-	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OLDPENCV})
-else()
-	set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
-	set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
-	set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
-endif(MSVC)
+set(CUSTOM_OPENCV_INCLUDES_DIR ${CONAN_INCLUDE_DIRS_OPENCV})
+set(CUSTOM_OPENCV_LIBS_DIR ${CONAN_LIB_DIRS_OPENCV})
+set(CUSTOM_OPENCV_LIBS ${CONAN_LIBS_OPENCV})
 
 set(${MODULE_PREFIX}_SRCS
 	libvideorecord.h
@@ -43,7 +37,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libaudions
 	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon/common_video
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
-	${ThirdPartyHeadRoot}/WMSDK
 	)
 
 if(MSVC)

addin/cmake/DependencyConanFiles.cmake

@@ -40,7 +40,7 @@ if(MSVC)
 			#mod_IDCertificate libwmvrecord mod_livenessdetection mod_screenshot mod_snapshot libfacecapture
 			opencv/3.1.0@LR04.02_ThirdParty/msvc
 			#mod_sipphone
-			oldpencv/2.3.0@LR04.02_ThirdParty/msvc
+			#oldpencv/2.3.0@LR04.02_ThirdParty/msvc
 			#mod_sipphone mod_mediacontroller livenessdetection libaudioframwork libmediaplayer libvideocapture 
 			#libvideoframwork libwmvrecord showdev mod_screenshot mod_snapshot
 			ffmpeg/4.1@LR04.02_ThirdParty/msvc