Z991239-6287 #comment 去除实体对opencv卡的直接依赖

Module/mod_screenshot/CMakeLists.txt

@@ -23,14 +23,12 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${OTHER_LIB_BASE_DIR}/rvcmediacommon
 	${OTHER_LIB_BASE_DIR}/libscreencodec
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libbizchan
-	${CONAN_INCLUDE_DIRS_OPENCV}
-    ${CONAN_INCLUDE_DIRS_OPENCV}/opencv
 )
 
 # 添加需要依赖的其他共享库（包括系统库）
-target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_OPENJPEG} ${CONAN_LIB_DIRS_OPENCV} ${CONAN_LIB_DIRS_ZLIB} )
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_OPENJPEG} ${CONAN_LIB_DIRS_ZLIB} )
 # 添加实体需要依赖的其他共享库（包括系统库）
-target_link_libraries(${MODULE_NAME} ${MODULE_BASE_LIBS} libbizchan libscreencodec ${CONAN_PKG_LIBS_OPENJPEG} ${CONAN_LIBS_OPENCV} ${CONAN_PKG_LIBS_ZLIB})
+target_link_libraries(${MODULE_NAME} ${MODULE_BASE_LIBS} libbizchan libscreencodec ${CONAN_PKG_LIBS_OPENJPEG} ${CONAN_PKG_LIBS_ZLIB})
 
 else(WIN32)
 
@@ -41,9 +39,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
 	${OTHER_LIB_BASE_DIR}/rvcmediacommon
 	${OTHER_LIB_BASE_DIR}/libscreencodec
-	${OTHER_LIB_PLATFORM_BASE_DIR}/libbizchan
-	${CONAN_INCLUDE_DIRS_OPENCV}
-    ${CONAN_INCLUDE_DIRS_OPENCV}/opencv)
+	${OTHER_LIB_PLATFORM_BASE_DIR}/libbizchan)
 #	${CONAN_INCLUDE_DIRS_LIBX11})
 
 # 添加需要依赖的其他共享库（包括系统库）
@@ -59,5 +55,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} ${CONAN_BIN_DIRS_OPENCV} PARENT_SCOPE)
+	set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
 endif(MSVC)

Module/mod_screenshot/mod_screenshot.cpp

@@ -11,12 +11,8 @@ using namespace AssistantChannel;
 #include "mod_assistantchannel/chan_protocol.h"
 
 #include "mod_assistantchannel/VideoDesc.h"
-// add by ly 20150514
 #include "jpeg2k.h"
 #include "ScreenShot_server_g.h"
-#include "cv.h"
-#include "highgui.h"
-#include "cxcore.h"
 
 #include "CommEntityUtil.hpp"
 

Module/mod_snapshot/CMakeLists.txt

@@ -14,8 +14,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
     ${MODULE_BASE_DIR}
 	${MODULE_BASE_DIR}/include
 	${MODULE_BASE_DIR}/mod_assistantchannel
-	${CONAN_INCLUDE_DIRS_OPENCV}
-    ${CONAN_INCLUDE_DIRS_OPENCV}/opencv
 	${OTHER_LIB_BASE_DIR}/libvideoqueue
 	${OTHER_LIB_BASE_DIR}/libfacecapture
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libbizchan
@@ -31,7 +29,6 @@ ${CONAN_LIB_DIRS_IPP}
 ${CONAN_LIB_DIRS_FFMPEG} 
 ${CONAN_LIB_DIRS_OPENJPEG} 
 ${CONAN_LIB_DIRS_ZLIB} 
-${CONAN_LIB_DIRS_OPENCV}
 ${CONAN_LIB_DIRS_LIBYUV}
 )
 else(MSVC)
@@ -39,9 +36,7 @@ target_link_directories(${MODULE_NAME} PRIVATE
 ${CONAN_LIB_DIRS_IPP} 
 ${CONAN_LIB_DIRS_FFMPEG} 
 ${CONAN_LIB_DIRS_OPENJPEG} 
-${CONAN_LIB_DIRS_ZLIB} 
-${CONAN_BIN_DIRS_OPENCV} 
-${CONAN_LIB_DIRS_OPENCV})
+${CONAN_LIB_DIRS_ZLIB})
 endif(MSVC)	
 
 if(WIN32)
@@ -51,7 +46,6 @@ set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS}
 	videoqueue
 	libbizchan
 	libfacecapture
-	${CONAN_LIBS_OPENCV}
 )
 else(WIN32)
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_ALL_LIBS}
@@ -63,7 +57,6 @@ set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_ALL_LIBS}
 	${CONAN_PKG_LIBS_IPP}
 	${CONAN_PKG_LIBS_OPENJPEG} 
 	${CONAN_PKG_LIBS_ZLIB}
-	${CONAN_LIBS_OPENCV}
 )
 endif(WIN32)
 
@@ -76,5 +69,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} ${CONAN_BIN_DIRS_OPENCV} PARENT_SCOPE)
+	set(MODULE_CONAN_DEP_LIBS ${MODULE_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
 endif(MSVC)

Module/mod_snapshot/mod_snapshot.cpp

@@ -17,8 +17,6 @@ using namespace AssistantChannel;
 #include "y2k_time.h"
 #include "EventCode.h"
 #include "CommEntityUtil.hpp"
-#include "cv.h"
-#include "highgui.h"
 
 #include "../mod_interactivecontrol/Event.h"