Z991239-1744 #comment 将第三方库引用集合到一个文件

DevAdapter/self/liblog4vendor/CMakeLists.txt

@@ -12,10 +12,6 @@ set(${MODULE_PREFIX}_SRCS
 
 rvc_set_win_dll_ver(${MODULE_PREFIX} ${RAW_VERSION_STRING})
 
-conan_cmake_run(REQUIRES log4cplus/1.2.1@LR04.02_ThirdParty/slim
-    BASIC_SETUP CMAKE_TARGETS
-    BUILD missing)
-
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 target_include_directories(${MODULE_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories(${MODULE_NAME} PRIVATE ${DEVADAPTER_CURRENT_INCLUDES_DIR})

Module/include/test/CMakeLists.txt

@@ -4,9 +4,6 @@ set(MODULE_PREFIX "TEST_MODULE_COMM")
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
 file(GLOB ${MODULE_PREFIX}_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp")
 
-conan_cmake_run(REQUIRES Catch/2.13.0@LR04.02_ThirdParty/stable
-			BASIC_SETUP CMAKE_TARGETS
-			BUILD missing)
 
 foreach(test ${${MODULE_PREFIX}_TESTS})
 	get_filename_component(test_name ${test} NAME_WE)

Module/mod_CustMngrAuth/CMakeLists.txt

@@ -10,9 +10,6 @@ file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE
 set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
-conan_cmake_run(REQUIRES jsoncpp/1.9.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMOM_INCLUDE_DIR}

Module/mod_IDCertificate/CMakeLists.txt

@@ -8,16 +8,6 @@ file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE
 	)
 
 
-
-if(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else()
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(MSVC)
-
 set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 

Module/mod_RomoteController/CMakeLists.txt

@@ -18,10 +18,6 @@ MESSAGE( STATUS "RomoteControl_CPP_SRCS = ${RomoteControl_CPP_SRCS}")
 MESSAGE( STATUS "RomoteControl_H_SRCS = ${RomoteControl_H_SRCS}")
 MESSAGE( STATUS "ZIP_SRCS = ${ZIP_SRCS}")
 
-	#need boost
-conan_cmake_run(REQUIRES boost/1.69.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
 
 MESSAGE( STATUS "BOOST_ROOT = ${CONAN_BOOST_ROOT}")
 #set(BOOST_ROOT /home/pcacc/Desktop/boost_1_69_0)
@@ -48,9 +44,7 @@ endif()
 
 #boost end
 
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
+
 
 MESSAGE( STATUS "CONAN_INCLUDE_DIRS_ZLIB = ${CONAN_INCLUDE_DIRS_ZLIB}")
 MESSAGE( STATUS "CONAN_PKG_LIBS_ZLIB = ${CONAN_PKG_LIBS_ZLIB}")

Module/mod_UpgradeRun/CMakeLists.txt

@@ -37,16 +37,7 @@ endif(WIN32)
 set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
-#附加包含的目录
-if(WIN32)
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
+
 
 #附加包含的目录(DevHeadPath:)
 target_include_directories(${MODULE_NAME} PRIVATE

Module/mod_chromium/CMakeLists.txt

@@ -59,18 +59,10 @@ set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 #附加包含的目录
 
-#need cefclient
-conan_cmake_run(REQUIRES cefclient/9.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
 
 set (TEST_CHROMIMU_DIR ${CONAN_CEFCLIENT_ROOT}/bin PARENT_SCOPE)
 
 
-#need boost
-conan_cmake_run(REQUIRES boost/1.69.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
 
 MESSAGE( STATUS "BOOST_ROOT = ${CONAN_BOOST_ROOT}")
 set(BOOST_ROOT ${CONAN_BOOST_ROOT})

Module/mod_livenessdetection/CMakeLists.txt

@@ -72,24 +72,7 @@ if(MSVC)
 endif(MSVC)
 
 
-if(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else()
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(MSVC)
 
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}

Module/mod_mediacontroller/CMakeLists.txt

@@ -37,68 +37,6 @@ if(WIN32)
 add_precompiled_header(${MODULE_NAME} stdafx.h SOURCE_CXX stdafx.cpp FORCEINCLUDE)
 endif(WIN32)
 
-if(WIN32)
-conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES portaudio/v19.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES IPP/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-if(WIN32)
-conan_cmake_run(REQUIRES spandsp/0.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES spandsp/0.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES apache-apr/1.4.2@LR04.02_ThirdParty/testing
-lib8k/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES apr/1.7.0@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}
@@ -116,6 +54,8 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SPEEXDSP}
+	${CONAN_LIB_DIRS_OPENCV}
+	${CONAN_LIB_DIRS_SOFIA}
 	if(WIN32)
 	${CONAN_LIB_DIRS_IPP}
 	${CONAN_LIB_DIRS_APACHE-APR}
@@ -134,6 +74,7 @@ set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS}
 	${CONAN_PKG_LIBS_FFMPEG}
 	${CONAN_PKG_LIBS_APACHE-APR}
 	${CONAN_PKG_LIBS_LIB8K}
+	${CONAN_LIBS_OPENCV}
 	ws2_32
 	strmiids
 	winmm
@@ -150,6 +91,7 @@ else(WIN32)
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS} 	
 	${CONAN_PKG_LIBS_PORTAUDIO}
 	${CONAN_PKG_LIBS_FFMPEG}
+	${CONAN_LIBS_OPENCV}
 	mediadeviceinfo
 	videocapture
 	asound
@@ -163,8 +105,6 @@ set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS}
 )
 endif(WIN32)
 
-
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-
-deploy_module(${MODULE_PREFIX} ${MODULE_NAME})
+deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

Module/mod_rpc/CMakeLists.txt

@@ -6,8 +6,6 @@ set(${MODULE_PREFIX}_SRCS
 	guitask.cpp)
 
 if(NOT BOOST_ROOT)
-conan_cmake_run(REQUIRES boost/1.69.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
 
 set(BOOST_ROOT ${CONAN_BOOST_ROOT})
 set(Boost_DEBUG ON)

Module/mod_screenshot/CMakeLists.txt

@@ -12,32 +12,7 @@ set(${MODULE_PREFIX}_SRCS
 set(MOD_VERSION_STRING "0.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
 
-conan_cmake_run(REQUIRES openjpeg/2.0.0@LR04.02_ThirdParty/testing
-    BASIC_SETUP CMAKE_TARGETS
-    BUILD missing)
-
-if(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(MSVC)
-
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
 
 if(WIN32)
 target_include_directories(${MODULE_NAME} PRIVATE
@@ -57,9 +32,6 @@ target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_OPENJPEG} ${CONA
 target_link_libraries(${MODULE_NAME} ${MODULE_BASE_LIBS} libbizchan libscreencodec ${CONAN_PKG_LIBS_OPENJPEG} ${CONAN_LIBS_OPENCV} ${CONAN_PKG_LIBS_ZLIB})
 
 else(WIN32)
-conan_cmake_run(REQUIRES libX11/1.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}

Module/mod_sipphone/CMakeLists.txt

@@ -59,73 +59,6 @@ if(WIN32)
 endif(WIN32)
 
 
-if(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else()
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(MSVC)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES portaudio/v19.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES IPP/1.0@LR04.02_ThirdParty/testing
-	lib8k/1.0@LR04.02_ThirdParty/testing
-#	spandsp/0.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES apache-apr/1.4.2@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES apr/1.7.0@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES sofia/1.12.11@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES sofia/1.13@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-spandsp/0.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_APR}/apr-1

Module/mod_snapshot/CMakeLists.txt

@@ -8,47 +8,8 @@ set(${MODULE_PREFIX}_SRCS
 set(MOD_VERSION_STRING "0.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
-if(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(MSVC)
-
-if(WIN32)
-conan_cmake_run(REQUIRES IPP/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES IPP/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
 
-conan_cmake_run(REQUIRES openjpeg/2.0.0@LR04.02_ThirdParty/testing
-    BASIC_SETUP CMAKE_TARGETS
-    BUILD missing)
-if(WIN32)
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
 
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}

Module/mod_upload/CMakeLists.txt

@@ -39,15 +39,7 @@ set(MOD_VERSION_STRING "1.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 #附加包含的目录
 
-#if(WIN32)
-#conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/testing
-#BASIC_SETUP CMAKE_TARGETS
-#BUILD missing)
-#else(WIN32)
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-#endif(WIN32)
+
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}

Module/mod_uplog/CMakeLists.txt

@@ -12,9 +12,6 @@ set(${MODULE_PREFIX}_SRCS
 set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
-conan_cmake_run(REQUIRES jsoncpp/1.9.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
 
 #附加包含的目录(DevHeadPath:)
 

Other/libaudioframework/CMakeLists.txt

@@ -164,80 +164,6 @@ if(WIN32)
 add_precompiled_header(${MODULE_NAME} precompile.h SOURCE_C precompile.c FORCEINCLUDE)
 endif(WIN32)
 
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES apache-apr/1.4.2@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES apr/1.7.0@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-if(WIN32)
-conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-if(WIN32)
-conan_cmake_run(REQUIRES spandsp/0.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES spandsp/0.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES lib8k/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES lib8k/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES libtiff/4.0.9@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES libtiff/4.0.9@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
 
 if(WIN32)
 target_include_directories(${MODULE_NAME} PRIVATE
@@ -272,7 +198,7 @@ endif(WIN32)
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CONAN_LIB_DIRS_RVCFRAMEWORK}
-	
+
 	${CONAN_LIB_DIRS_PORTAUDIO}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SPEEXDSP}

Other/libaudiorender/CMakeLists.txt

@@ -24,16 +24,6 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
-if(WIN32)
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	"${CONAN_RVCFRAMEWORK_ROOT}/include"

Other/libbizchan/CMakeLists.txt

@@ -14,10 +14,7 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
-# 依赖openjpeg
-conan_cmake_run(REQUIRES openjpeg/2.0.0@LR04.02_ThirdParty/testing
-    BASIC_SETUP CMAKE_TARGETS
-    BUILD missing)
+
 
 # 依赖libscreencodec、acmstrdec、acmstrenc
 target_include_directories(${MODULE_NAME} PRIVATE

Other/libfacecapture/CMakeLists.txt

@@ -44,14 +44,6 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
-if(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(MSVC)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	"${CONAN_RVCFRAMEWORK_ROOT}/include"

Other/libimageproc/CMakeLists.txt

@@ -14,14 +14,6 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
-if(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else()
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(MSVC)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	"${CONAN_RVCFRAMEWORK_ROOT}/include"

Other/libmediaplayer/CMakeLists.txt

@@ -21,17 +21,6 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-SDL2/2.0.9@LR04.02_ThirdParty/testing	
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-SDL2/2.0.12@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
 
 
 target_include_directories(${MODULE_NAME} PRIVATE

Other/libpictureplayer/CMakeLists.txt

@@ -11,13 +11,6 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
-if(WIN32)
-conan_cmake_run(REQUIRES SDL2/2.0.9@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else(WIN32)
-conan_cmake_run(REQUIRES SDL2/2.0.12@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS)
-endif(WIN32)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}

Other/libscreencodec/CMakeLists.txt

@@ -9,15 +9,7 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
-if(WIN32)
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES zlib/1.2.11@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
+
 
 
 target_include_directories(${MODULE_NAME} PRIVATE

Other/libvideocapture/CMakeLists.txt

@@ -19,16 +19,6 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
 
 #if(WIN32)
 #conan_cmake_run(REQUIRES libyuv/1766@LR04.02_ThirdParty/shared

Other/libvideoframework/CMakeLists.txt

@@ -206,15 +206,6 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
 
 #add_precompiled_header(${MODULE_NAME} precompile.h SOURCE_CXX precompile.cpp FORCEINCLUDE)
 
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
 
 
 

Other/libvideoqueue/CMakeLists.txt

@@ -27,15 +27,7 @@ if(MSVC)
 add_precompiled_header(${MODULE_NAME} stdafx.h SOURCE_CXX stdafx.cpp FORCEINCLUDE)
 endif(MSVC)
 
-if(WIN32)
-conan_cmake_run(REQUIRES IPP/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES IPP/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
+
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	"${CONAN_RVCFRAMEWORK_ROOT}/include"

Other/libvideorender/CMakeLists.txt

@@ -19,14 +19,6 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
-if(WIN32)
-conan_cmake_run(REQUIRES SDL2/2.0.9@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else(WIN32)
-conan_cmake_run(REQUIRES SDL2/2.0.12@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS)
-endif(WIN32)
-
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_SDL2}

Other/libwmvrecord/CMakeLists.txt

@@ -15,52 +15,13 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
-if(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
-else(MSVC)
-conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(MSVC)
-
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-if(WIN32)
-conan_cmake_run(REQUIRES freetype/2.10.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES freetype/2.10.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
 
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
-	${CONAN_INCLUDE_DIRS_FREETYPE}
+	${CONAN_INCLUDE_DIRS_FREETYPE}/freetype2
 	${CONAN_INCLUDE_DIRS_SPEEXDSP}
     ${CONAN_INCLUDE_DIRS_OPENCV}
     ${CONAN_INCLUDE_DIRS_OPENCV}/opencv

Other/showdev/CMakeLists.txt

@@ -21,65 +21,6 @@ set(${MODULE_PREFIX}_SRCS
 
 add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS})
 
-#if(WIN32)
-#conan_cmake_run(REQUIRES apache-apr/1.4.2@LR04.02_ThirdParty/testing
-#BASIC_SETUP CMAKE_TARGETS
-#BUILD missing)
-#else(WIN32)
-#conan_cmake_run(REQUIRES apache-apr/1.6.3@LR04.02_ThirdParty/testing
-#BASIC_SETUP CMAKE_TARGETS
-#BUILD missing)
-#endif(WIN32)
-
-if(WIN32)
-conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES portaudio/v19.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
-if(WIN32)
-conan_cmake_run(REQUIRES lib8k/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES lib8k/1.0@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-if(WIN32)
-conan_cmake_run(REQUIRES spandsp/0.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES spandsp/0.0.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-if(WIN32)
-else(WIN32)
-conan_cmake_run(REQUIRES alsa/1.1.6@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_APACHE-APR}/include

Plugins/MediaDevDetect/CMakeLists.txt

@@ -6,14 +6,6 @@ find_package(Qt5 COMPONENTS Widgets REQUIRED
 
 find_package(Qt5UiTools HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
 
-if(WIN32)
-    conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
-    BASIC_SETUP CMAKE_TARGETS)
-else(WIN32)
-    conan_cmake_run(REQUIRES portaudio/v19.0.6@LR04.02_ThirdParty/testing
-    alsa/1.1.6@LR04.02_ThirdParty/testing
-    BASIC_SETUP CMAKE_TARGETS)
-endif(WIN32)
 
 set(${MODULE_PREFIX}_SRCS
     mainform.cpp

addin/cmake/DependencyConanFiles.cmake

@@ -1,3 +1,39 @@
-conan_cmake_run(REQUIRES expat/2.1.0@LR04.02_ThirdParty/testing 
-scew/1.1.7@LR04.02_ThirdParty/testing
-BASIC_SETUP CMAKE_TARGETS)
+if(MSVC)
+conan_cmake_run(REQUIRES 
+opencv/3.1.0@LR04.02_ThirdParty/testing               #mod_sipphone mod_IDCertificate libwmvrecord mod_livenessdetection mod_screenshot mod_snapshot libfacecapture libimageproc
+ffmpeg/4.1@LR04.02_ThirdParty/testing                 #mod_sipphone mod_mediacontroller livenessdetection libaudioframwork libmediaplayer libvideocapture libvideoframwork libwmvrecord showdev mod_screenshot mod_snapshot
+apache-apr/1.4.2@LR04.02_ThirdParty/testing           #mod_mediacontroller libaudioframwork mod_sipphone
+SDL2/2.0.9@LR04.02_ThirdParty/testing                 #libpictureplayer libvideorender
+sofia/1.12.11@LR04.02_ThirdParty/testing              #mod_sipphone
+portaudio/v190600.20161030@LR04.02_ThirdParty/testing #mod_sipphone mod_mediacontroller showdev MediaDevDetect libaudioframwork
+BASIC_SETUP CMAKE_TARGETS)
+else()
+conan_cmake_run(REQUIRES 
+opencv/3.1.0@LR04.02_ThirdParty/stable                #mod_sipphone mod_IDCertificate libwmvrecord mod_livenessdetection mod_screenshot mod_snapshot libfacecapture libimageproc
+sofia/1.13@LR04.02_ThirdParty/testing                 #mod_sipphone
+apr/1.7.0@LR04.02_ThirdParty/shared                   #mod_mediacontroller libaudioframwork mod_sipphone
+portaudio/v19.0.6@LR04.02_ThirdParty/testing          #mod_sipphone mod_mediacontroller showdev MediaDevDetect
+ffmpeg/4.1.6@LR04.02_ThirdParty/stable                #mod_sipphone mod_mediacontroller livenessdetection libaudioframwork libmediaplayer libvideocapture libvideoframwork libwmvrecord showdev mod_screenshot mod_snapshot
+SDL2/2.0.12@LR04.02_ThirdParty/shared                 #libpictureplayer libvideorender
+libX11/1.6@LR04.02_ThirdParty/testing                 #mod_screenshot
+alsa/1.1.6@LR04.02_ThirdParty/testing                 #showdev MediaDevDetect
+BASIC_SETUP CMAKE_TARGETS)
+endif(MSVC)
+
+conan_cmake_run(REQUIRES 
+expat/2.1.0@LR04.02_ThirdParty/testing      #mod_download mod_evtconverter mod_ThermalPrint 
+scew/1.1.7@LR04.02_ThirdParty/testing       #mod_ThermalPrint mod_evtconverter mod_download
+zlib/1.2.11@LR04.02_ThirdParty/stable       #mod_snapshot mod_screenshot mod_RomoteController mod_UpgradeRun mod_upload libscreencodec 
+openjpeg/2.0.0@LR04.02_ThirdParty/testing   #libbizchan mod_screenshot mod_snapshot
+IPP/1.0@LR04.02_ThirdParty/testing          #mod_snapshot mod_mediacontroller mod_sipphone libvideoqueue
+SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing  #mod_sipphone libwmvrecord libaudioframwork mod_mediacontroller libaudiorender
+spandsp/0.0.6@LR04.02_ThirdParty/testing    #showdev mod_mediacontroller mod_sipphone libaudioframwork
+lib8k/1.0@LR04.02_ThirdParty/testing        #mod_mediacontroller libaudioframwork showdev mod_sipphone
+libtiff/4.0.9@LR04.02_ThirdParty/testing    #libaudioframwork
+freetype/2.10.0@LR04.02_ThirdParty/testing  #libwmvrecord
+Catch/2.13.0@LR04.02_ThirdParty/stable      #include/test
+jsoncpp/1.9.0@LR04.02_ThirdParty/stable     #mod_CustMngrAuth mod_uplog
+cefclient/11.0@LR04.02_ThirdParty/testing   #mod_chromium
+boost/1.69.0@LR04.02_ThirdParty/testing     #mod_chromium mod_RomoteController mod_rpc
+log4cplus/1.2.1@LR04.02_ThirdParty/slim     #liblog4vendor
+BASIC_SETUP CMAKE_TARGETS)