Z991239-5337 #comment 全量编译通过

CMakeLists.txt

@@ -283,15 +283,8 @@ if(CONAN_CACHE_CLEAR)
 	conan_local_remove()
 endif(CONAN_CACHE_CLEAR)
 
-if(MSVC)
-conan_cmake_run(REQUIRES RvcFramework/1.2.0.119@LR04.02_FrameworkLib/dev
-	Audio/2024.0118.01@LR04.02_MediaRes/testing
-BASIC_SETUP CMAKE_TARGETS)
-else()
-conan_cmake_run(REQUIRES RvcFramework/1.2.0.119@LR04.02_FrameworkLib/dev
-	Audio/2024.0118.01@LR04.02_MediaRes/testing
+conan_cmake_run(REQUIRES Audio/2024.0118.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
-endif(MSVC)
 
 include(DependencyConanFiles)
 
@@ -601,7 +594,7 @@ else()
 
 endif(SIMULATE_ON)#end simulate
 
-add_subdirectory(ThirdParty)
+add_subdirectory(Framework)
 if(BUILD_MODULE)
 	add_subdirectory(Other)
 	add_subdirectory(Module)

Framework/RVCComm/test/CMakeLists.txt

@@ -22,14 +22,12 @@ foreach(test ${${MODULE_PREFIX}_TESTS})
 	add_executable(${test_name} ${test})
 	target_link_directories(${test_name} PRIVATE ${ADD_LIB_DIRS})
 	target_link_libraries(${test_name} PRIVATE ${comm_test_libraries} PUBLIC CONAN_PKG::gtest)
-	# target_link_libraries(${test_name} PRIVATE  ${KYSM_LIBRARY_NAME})
 	target_link_libraries(${test_name} PRIVATE ${CONAN_LIBS_LIBSSH2}
 		${CONAN_LIBS_CURL}
 		${CONAN_LIBS_JSONCPP})
 	set_property(TARGET ${test_name} PROPERTY FOLDER "test/rvccomm")
 	if (BUILD_SHARED_LIBS)
 		set_target_properties(${test_name} PROPERTIES COMPILE_DEFINITIONS 
-		# "GTEST_LINKED_AS_SHARED_LIBRARY=1;RVCCOMM_LINKED_AS_STATIC_LIBRARY=1")
 		"RVCCOMM_LINKED_AS_STATIC_LIBRARY=1")
 	else()
 		set_target_properties(${test_name} PROPERTIES COMPILE_DEFINITIONS "RVCCOMM_LINKED_AS_STATIC_LIBRARY=1")

Framework/sphost/CMakeLists.txt

@@ -28,13 +28,9 @@ endif(NOT MSVC)
 add_executable(${MODULE_NAME} WIN32 ${${MODULE_PREFIX}_SRCS})
 
 target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_LIBKYSM})
-
-# target_include_directories(${MODULE_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/test")
 list(APPEND ${MODULE_PREFIX}_LIBS ${KYSM_LIBRARY_NAME})
-
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-
 install(TARGETS ${MODULE_NAME} 
     RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
     ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"

Module/CMakeLists.txt

@@ -24,15 +24,6 @@ set(MODULE_BASE_ALL_LIBS ${MODULE_BASE_LIBS} ${RVCCOMM_LIB})
 if(NOT MSVC)
     list(APPEND MODULE_BASE_LIBS ${WINPR_LIB})
 endif(NOT MSVC)
-set(MODULE_BASE_INCLUDES ${ModuleCommonHeadPath} ${RVC_TOOLKIT_INCLUDE_DIR})
-
-SET(RVC_COMMON_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/Common PARENT_SCOPE)
-SET(RVC_TOOLKIT_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit PARENT_SCOPE)
-SET(RVC_WINPR_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include)
-
-SET(RVC_FRAMEWORK_LIBRARIES_DIR ${CONAN_LIB_DIRS_RVCFRAMEWORK})
-SET(RVC_FRAMEWORK_INCLUDES_DIR ${RVC_COMMON_INCLUDE_DIR} 
-    ${RVC_TOOLKIT_INCLUDE_DIR} ${RVC_WINPR_INCLUDE_DIR})
 
 set(BUILD_MOUDLE_TEST OFF)
 if(BUILD_TESTING)
@@ -94,7 +85,10 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     endif()
 
     target_compile_definitions(${_module_name} PUBLIC "${_module_prefix}_EXPORTS")
-    target_include_directories(${_module_name} PRIVATE ${MODULE_BASE_INCLUDES} ${THIRD_PARTY_BASE_DIR}/Include/CJson ${OTHER_LIB_BASE_DIR}/libpublicFun)
+    target_include_directories(${_module_name} PRIVATE 
+        ${ModuleCommonHeadPath}
+        ${THIRD_PARTY_BASE_DIR}/Include/CJson 
+        ${OTHER_LIB_BASE_DIR}/libpublicFun)
     if(BUILD_MOUDLE_TEST)
         target_compile_definitions(${_module_name} PRIVATE "WITH_BUILD_MODULE_TEST")
 	    target_include_directories(${_module_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
@@ -116,8 +110,7 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
         ${CMAKE_CURRENT_BINARY_DIR}
         ${RVC_FRAMEWORK_INCLUDES_DIR}
         )
-    target_link_directories(${_module_name} PRIVATE
-            ${RVC_FRAMEWORK_LIBRARIES_DIR})
+    message(STATUS "module: ${RVC_FRAMEWORK_INCLUDES_DIR}")
 
 endmacro(add_module_libraries)
 

Module/include/test/CMakeLists.txt

@@ -9,8 +9,7 @@ foreach(test ${${MODULE_PREFIX}_TESTS})
 	get_filename_component(test_name ${test} NAME_WE)
 	add_executable(${test_name} ${test})
 	target_include_directories(${test_name} PRIVATE ${CONAN_INCLUDE_DIRS_CATCH} ${OTHER_LIB_BASE_DIR}/libpublicFun)
-	target_include_directories(${test_name} PRIVATE ${MODULE_BASE_INCLUDES} ${RVC_FRAMEWORK_INCLUDES_DIR})
-	target_link_directories(${test_name} PRIVATE ${RVC_FRAMEWORK_LIBRARIES_DIR})
+	target_include_directories(${test_name} PRIVATE ${ModuleCommonHeadPath} ${RVC_FRAMEWORK_INCLUDES_DIR})
 	target_link_libraries(${test_name} PRIVATE ${MODULE_BASE_LIBS})
 	set_property(TARGET ${test_name} PROPERTY FOLDER "test/module")
 	set_target_properties(${test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${TESTING_OUTPUT_DIRECTORY}")

Module/mod_SalesRecorder/CMakeLists.txt

@@ -13,7 +13,6 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 	${MODULE_BASE_DIR}/mod_healthmanager
 	${OTHER_LIB_BASE_DIR}

Module/mod_UpgradeMgr/CMakeLists.txt

@@ -39,7 +39,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${ModuleCommonHeadPath}
 	${MODULE_BASE_DIR}/mod_localmediaplay
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
+	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${CONAN_INCLUDE_DIRS_ZLIB}
 )

Module/mod_agentip/CMakeLists.txt

@@ -10,7 +10,6 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 )
 

Module/mod_assistantchannel/CMakeLists.txt

@@ -11,7 +11,6 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 # ÒÀÀµlibbizchan
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
     ${OTHER_LIB_PLATFORM_BASE_DIR}/libbizchan
     ${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon

Module/mod_assistantchannel/mod_assistantchannel.h

@@ -9,7 +9,7 @@
 #include "AssistantChannel_server_g.h"
 #include "AssistantChannel_def_g.h"
 
-#include "Common/ListEntry.h"
+#include "ListEntry.h"
 #include "mod_counterconnector/CallType.h"
 #include "bizchan.h"
 #include "rvc_media_common.h"

Module/mod_chromium/CMakeLists.txt

@@ -171,7 +171,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${ThirdPartyHeadRoot}/CJson
 	${ThirdPartyHeadRoot}/modp_b64
 	${ThirdPartyHeadRoot}/requests/include
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${ThirdPartyHeadRoot}/rpcServer
 	${ThirdPartyHeadRoot}/msgpack
 	${MODULE_BASE_DIR}/mod_upload

Module/mod_countercontext/CMakeLists.txt

@@ -11,7 +11,6 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 	${MODULE_BASE_DIR}/mod_assistantchannel
 )

Module/mod_initiativetransfer/CMakeLists.txt

@@ -18,7 +18,6 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 	${MODULE_BASE_DIR}/mod_assistantchannel
 )

Module/mod_interactioncontext/CMakeLists.txt

@@ -15,7 +15,6 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 	${MODULE_BASE_DIR}/mod_assistantchannel
 )

Module/mod_livenessdetection/CMakeLists.txt

@@ -28,10 +28,9 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 if(MSVC)
 target_include_directories(${MODULE_NAME} PRIVATE
-	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${RVC_COMMON_INCLUDE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit
+	${RVC_TOOLKIT_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
 	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
@@ -45,10 +44,9 @@ target_include_directories(${MODULE_NAME} PRIVATE
 )
 else()
 target_include_directories(${MODULE_NAME} PRIVATE
-	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${RVC_COMMON_INCLUDE_DIR}
 	${CMAKE_CURRENT_SOURCE_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit
+	${RVC_TOOLKIT_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
 	${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
@@ -64,7 +62,6 @@ endif(MSVC)
 
 
 target_link_directories(${MODULE_NAME} PRIVATE
-	${RVC_FRAMEWORK_LIBRARIES_DIR}
 	${CONAN_LIB_DIRS_BOOST}
 	${CONAN_LIB_DIRS_OPENSSL}
 	${CONAN_LIB_DIRS_LIBJPEG}

Module/mod_recorder/CMakeLists.txt

@@ -14,7 +14,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CONAN_INCLUDE_DIRS_FFMPEG}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
     ${OTHER_LIB_PLATFORM_BASE_DIR}/libvideorecord
     ${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon

Module/mod_screenshot/CMakeLists.txt

@@ -17,7 +17,6 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 if(WIN32)
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 	${MODULE_BASE_DIR}/include
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
@@ -37,7 +36,6 @@ else(WIN32)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 	${MODULE_BASE_DIR}/include
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework

Module/mod_sipphone/CMakeLists.txt

@@ -57,8 +57,7 @@ set(MOD_VERSION_STRING "0.0.1-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_APR}/apr-1
-	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit
+	${RVC_TOOLKIT_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CUSTOM_OPENCV_INCLUDES_DIR}
 	${CUSTOM_OPENCV_INCLUDES_DIR}/opencv
@@ -106,7 +105,6 @@ if(MSVC)
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CUSTOM_OPENCV_LIBS_DIR}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SOFIA}
 	${CONAN_LIB_DIRS_SPEEXDSP}
@@ -123,7 +121,6 @@ target_link_directories(${MODULE_NAME} PRIVATE
     ${CONAN_LIB_DIRS_PULSEAUDIO}
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CUSTOM_OPENCV_LIBS_DIR}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SOFIA}
 	${CONAN_LIB_DIRS_SPEEXDSP}

Module/mod_snapshot/CMakeLists.txt

@@ -13,11 +13,9 @@ add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
     ${MODULE_BASE_DIR}
 	${MODULE_BASE_DIR}/include
 	${MODULE_BASE_DIR}/mod_assistantchannel
-	#${MODULE_BASE_DIR}/mod_mediacontroller
 	${CONAN_INCLUDE_DIRS_OPENCV}
     ${CONAN_INCLUDE_DIRS_OPENCV}/opencv
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue

Module/mod_upload/CMakeLists.txt

@@ -40,7 +40,6 @@ message(STATUS "CONAN_INCLUDE_DIRS_ZLIB ${CONAN_INCLUDE_DIRS_ZLIB}")
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_INCLUDE_DIRS_ZLIB}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${CONAN_INCLUDE_DIRS_JSONCPP}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libfilecryption
 	${ThirdPartyHeadRoot}/XZip

Other/acmstrdec/CMakeLists.txt

@@ -15,7 +15,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 # 依赖openssl
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_OPENSSL}
     )

Other/acmstrenc/CMakeLists.txt

@@ -15,7 +15,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 # 依赖openssl
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_OPENSSL}
     )

Other/libpublicFun/CMakeLists.txt

@@ -41,7 +41,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 # 依赖libscreencodec、acmstrdec、acmstrenc
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
     ${THIRD_PARTY_BASE_DIR}/Include/CJson
     )

Other/libscreencodec/CMakeLists.txt

@@ -9,7 +9,6 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
     ${CONAN_INCLUDE_DIRS_ZLIB}
     ${CONAN_INCLUDE_DIRS_IPP}

Other/unix/libaudioframework/CMakeLists.txt

@@ -171,7 +171,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${CONAN_INCLUDE_DIRS_SPEEXDSP}
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_LIB8K}
@@ -184,13 +183,12 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${CONAN_INCLUDE_DIRS_SPEEXDSP}
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_LIB8K}
 	${CONAN_INCLUDE_DIRS_LIBTIFF}
 	${CONAN_INCLUDE_DIRS_APR}/apr-1
-	${CONAN_RVCFRAMEWORK_ROOT}/include/winpr
+	${RVC_WINPR_INCLUDE_DIR}/winpr
 	${CONAN_INCLUDE_DIRS_SPANDSP}
 	)
 endif(WIN32)
@@ -198,7 +196,6 @@ endif(WIN32)
 
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SPEEXDSP}
 	${CONAN_LIB_DIRS_LIB8K}

Other/unix/libaudions/CMakeLists.txt

@@ -50,22 +50,9 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
 target_include_directories(${MODULE_NAME} PRIVATE
-   #"${CONAN_RVCFRAMEWORK_ROOT}/include"
-	#${RVC_COMMON_INCLUDE_DIR}
 	webrtc_ns/include
 	)
 
-
-target_link_directories(${MODULE_NAME} PRIVATE
-	#${CONAN_LIB_DIRS_RVCFRAMEWORK}
-	)
-
-set(${MODULE_PREFIX}_LIBS PRIVATE
-	#${SPBASE_LIB}
-	#${TOOLKIT_LIB}
-	#${RVCCOMM_LIB}
-)
-
 target_compile_definitions(${MODULE_NAME} PUBLIC "IAUDIONSINTERFACE_API")
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS})  

Other/unix/libaudioqueue/CMakeLists.txt

@@ -28,22 +28,16 @@ add_precompiled_header(${MODULE_NAME} stdafx.h SOURCE_CXX stdafx.cpp FORCEINCLUD
 endif(MSVC)
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	)
 
 message(STATUS "rvc common include dir is ${RVC_COMMON_INCLUDE_DIR}")
 
-target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
-	)
-
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}	
 	#${SPBASE_LIB}
 	sharememory
 	)  
 
-
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBAUDIOQUEUE_EXPORTS")
 
 if(MSVC)

Other/unix/libbizchan/CMakeLists.txt

@@ -18,7 +18,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 # 依赖libscreencodec、acmstrdec、acmstrenc
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
     ${CONAN_INCLUDE_DIRS_LIBKYSM}
     ${CONAN_INCLUDE_DIRS_OPENJPEG}
@@ -35,11 +34,10 @@ target_include_directories(${MODULE_NAME} PRIVATE
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBBIZCHAN_EXPORTS")
 
 # 添加需要依赖的其他共享库（包括系统库）
-target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_RVCFRAMEWORK} ${CONAN_LIB_DIRS_LIBKYSM} ${CONAN_LIB_DIRS_OPENJPEG})
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_LIBKYSM} ${CONAN_LIB_DIRS_OPENJPEG})
 
 if(WIN32)
 set(${MODULE_PREFIX}_LIBS PRIVATE
-    ${CONAN_LIBS_RVCFRAMEWORK}
 	${CONAN_LIBS_LIBKYSM}
     acmstrdec
     acmstrenc
@@ -50,7 +48,6 @@ set(${MODULE_PREFIX}_LIBS PRIVATE
 )
 else()
 set(${MODULE_PREFIX}_LIBS PRIVATE
-    ${CONAN_LIBS_RVCFRAMEWORK}
 	${CONAN_LIBS_LIBKYSM}
     acmstrdec
     acmstrenc

Other/unix/libfacecapture/CMakeLists.txt

@@ -46,7 +46,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${RVC_COMMON_INCLUDE_DIR}
     ${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue
     ${CONAN_INCLUDE_DIRS_OPENCV}
@@ -59,20 +58,16 @@ target_compile_definitions(${MODULE_NAME} PUBLIC "LIBFACECAPTURE_EXPORTS")
 # 添加需要依赖的其他共享库（包括系统库）
 if(MSVC)
 target_link_directories(${MODULE_NAME} PRIVATE
-    ${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_OPENCV}
 	)
 else(MSVC)
 target_link_directories(${MODULE_NAME} PRIVATE
-    ${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_BIN_DIRS_OPENCV}
-    #${CONAN_LIB_DIRS_OPENCV}
 	)
 endif(MSVC)	
 
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}
-    ${CONAN_LIBS_RVCFRAMEWORK}
     videoqueue
 	${OPENCV_DYNAMIC_LIBS}
 	)

Other/unix/libmediadeviceinfo/CMakeLists.txt

@@ -16,14 +16,9 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_TOOLKIT_INCLUDE_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
+	${RVC_FRAMEWORK_INCLUDES_DIR}
 	)
 
-target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
-	)
-
-
 # 添加实体需要依赖的其他共享库（包括系统库）
 if(WIN32)
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS} 

Other/unix/libpictureplayer/CMakeLists.txt

@@ -15,16 +15,14 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_SDL2}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
+	${RVC_FRAMEWORK_INCLUDES_DIR}
 	)
 
 
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_SDL2}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	)
 
-
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}	PRIVATE
 	${CONAN_LIBS_SDL2}
 	)  

Other/unix/libsharememory/CMakeLists.txt

@@ -10,7 +10,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	)
 

Other/unix/libvideocapture/CMakeLists.txt

@@ -43,7 +43,6 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CONAN_LIB_DIRS_LIBYUV}
 	${CONAN_LIB_DIRS_LIBJPEG}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	)
 
 message(STATUS "CONAN_LIBS_LIBYUV = ${CONAN_LIBS_LIBYUV}")

Other/unix/libvideoframework/CMakeLists.txt

@@ -213,20 +213,17 @@ add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${RVC_TOOLKIT_INCLUDE_DIR}
-	${RVC_COMMON_INCLUDE_DIR}
 	)
 
 message(STATUS "ffmpeg include dir is ${CONAN_INCLUDE_DIRS_FFMPEG}")
 message(STATUS "toolkit include dir is ${RVC_TOOLKIT_INCLUDE_DIR}")
-message(STATUS "framework root include dir is ${CONAN_RVCFRAMEWORK_ROOT}")
+message(STATUS "framework root include dir is ${RVC_FRAMEWORK_INCLUDES_DIR}")
 message(STATUS "common include dir is ${RVC_COMMON_INCLUDE_DIR}")
 
 
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	)
 
 

Other/unix/libvideoqueue/CMakeLists.txt

@@ -30,7 +30,6 @@ endif(MSVC)
 
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_IPP}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
@@ -39,7 +38,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 message(STATUS "rvc common include dir is ${RVC_COMMON_INCLUDE_DIR}")
 
 target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_IPP}
 	)
 

Other/unix/libvideorecord/CMakeLists.txt

@@ -20,7 +20,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 message(STATUS "freetype2: ${CONAN_INCLUDE_DIRS_FREETYPE}")
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_FREETYPE_ROOT}/include/freetype2

Other/unix/libvideorender/CMakeLists.txt

@@ -22,13 +22,11 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_SDL2}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	)
 
 
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_SDL2}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	)
 
 

Other/unix/showdev/CMakeLists.txt

@@ -26,7 +26,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_APACHE-APR}/include
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}
 	${RVC_TOOLKIT_INCLUDE_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
+	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_INCLUDE_DIRS_SPANDSP}
 	)
@@ -34,7 +34,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_APACHE-APR}
 	${CONAN_LIB_DIRS_PORTAUDIO}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CONAN_LIB_DIRS_LIB8K}
 	${CONAN_LIB_DIRS_SPANDSP}

Other/win/libaudioframework/CMakeLists.txt

@@ -69,7 +69,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}/common
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${CONAN_INCLUDE_DIRS_SPEEXDSP}
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_LIB8K}
@@ -84,13 +83,12 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${CONAN_INCLUDE_DIRS_SPEEXDSP}
 	${RVC_TOOLKIT_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_LIB8K}
 	${CONAN_INCLUDE_DIRS_LIBTIFF}
 	${CONAN_INCLUDE_DIRS_APR}/apr-1
-	${CONAN_RVCFRAMEWORK_ROOT}/include/winpr
+	${RVC_WINPR_INCLUDE_DIR}/winpr
 	${CONAN_INCLUDE_DIRS_SPANDSP}
 	)
 endif(WIN32)
@@ -98,7 +96,6 @@ endif(WIN32)
 
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SPEEXDSP}
 	${CONAN_LIB_DIRS_LIB8K}

Other/win/libaudions/CMakeLists.txt

@@ -44,22 +44,9 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
 target_include_directories(${MODULE_NAME} PRIVATE
-   #"${CONAN_RVCFRAMEWORK_ROOT}/include"
-	#${RVC_COMMON_INCLUDE_DIR}
 	webrtc_ns/include
 	)
 
-
-target_link_directories(${MODULE_NAME} PRIVATE
-	#${CONAN_LIB_DIRS_RVCFRAMEWORK}
-	)
-
-set(${MODULE_PREFIX}_LIBS PRIVATE
-	#${SPBASE_LIB}
-	#${TOOLKIT_LIB}
-	#${RVCCOMM_LIB}
-)
-
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBAUDIONS_EXPORTS")
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS})  

Other/win/libaudioqueue/CMakeLists.txt

@@ -21,17 +21,12 @@ add_precompiled_header(${MODULE_NAME} stdafx.h SOURCE_CXX stdafx.cpp FORCEINCLUD
 endif(MSVC)
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libsharememory
 	)
 
 message(STATUS "rvc common include dir is ${RVC_COMMON_INCLUDE_DIR}")
 
-target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
-	)
-
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}	
 	sharememory
 	)  

Other/win/libbizchan/CMakeLists.txt

@@ -18,14 +18,12 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 # 依赖libscreencodec、acmstrdec、acmstrenc
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
     ${CONAN_INCLUDE_DIRS_LIBKYSM}
     ${CONAN_INCLUDE_DIRS_OPENJPEG}
     ${OTHER_LIB_BASE_DIR}/libscreencodec
     ${OTHER_LIB_BASE_DIR}/acmstrdec
     ${OTHER_LIB_BASE_DIR}/acmstrenc
-    #chan_protocol.h
     ${MODULE_BASE_DIR}/mod_assistantchannel
     )
 
@@ -36,11 +34,10 @@ target_include_directories(${MODULE_NAME} PRIVATE
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBBIZCHAN_EXPORTS")
 
 # 添加需要依赖的其他共享库（包括系统库）
-target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_RVCFRAMEWORK} ${CONAN_LIB_DIRS_LIBKYSM} ${CONAN_LIB_DIRS_OPENJPEG})
+target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_LIBKYSM} ${CONAN_LIB_DIRS_OPENJPEG})
 
 if(WIN32)
 set(${MODULE_PREFIX}_LIBS PRIVATE
-    ${CONAN_LIBS_RVCFRAMEWORK}
 	${CONAN_LIBS_LIBKYSM}
     acmstrdec
     acmstrenc
@@ -51,7 +48,6 @@ set(${MODULE_PREFIX}_LIBS PRIVATE
 )
 else()
 set(${MODULE_PREFIX}_LIBS PRIVATE
-    ${CONAN_LIBS_RVCFRAMEWORK}
 	${CONAN_LIBS_LIBKYSM}
     acmstrdec
     acmstrenc

Other/win/libfacecapture/CMakeLists.txt

@@ -15,7 +15,6 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${RVC_COMMON_INCLUDE_DIR}
     ${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoqueue
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libsharememory
@@ -28,20 +27,11 @@ target_compile_definitions(${MODULE_NAME} PUBLIC "LIBFACECAPTURE_EXPORTS")
 
 
 # 添加需要依赖的其他共享库（包括系统库）
-if(MSVC)
-target_link_directories(${MODULE_NAME} PRIVATE
-    ${CONAN_LIB_DIRS_RVCFRAMEWORK}
-	${CUSTOM_OPENCV_LIBS_DIR}
-	)
-else(MSVC)
 target_link_directories(${MODULE_NAME} PRIVATE
-    ${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CUSTOM_OPENCV_LIBS_DIR}
 	)
-endif(MSVC)	
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}
-    ${CONAN_LIBS_RVCFRAMEWORK}
     videoqueue
 	${CUSTOM_OPENCV_LIBS}
 	)

Other/win/libimgplayer/CMakeLists.txt

@@ -4,7 +4,7 @@ set(MODULE_PREFIX "LIB_IMAGPLAYER_FUNC")
 add_definitions(-D_AFXDLL)
 
 if(MSVC)
-    set(STDAFXCPP ${RVC_COMMON_INCLUDE_DIR}/stdafx.cpp)
+    set(STDAFXCPP ${RVC_FRAMEWORK_INCLUDE_DIR}/stdafx.cpp)
 else()
 	 set(STDAFXCPP )
 endif(MSVC)
@@ -22,7 +22,6 @@ message(STATUS "RVC_COMMON_INCLUDE_DIR ${RVC_COMMON_INCLUDE_DIR}")
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	)
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBIMAGPLAYER_EXPORTS")

Other/win/libmediadeviceinfo/CMakeLists.txt

@@ -16,14 +16,9 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_TOOLKIT_INCLUDE_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
+	${RVC_FRAMEWORK_INCLUDES_DIR}
 	)
 
-target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
-	)
-
-
 # 添加实体需要依赖的其他共享库（包括系统库）
 if(WIN32)
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS} 

Other/win/libpictureplayer/CMakeLists.txt

@@ -16,16 +16,13 @@ message(STATUS "CONAN_INCLUDE_DIRS_SDL2 :${CONAN_INCLUDE_DIRS_SDL2}")
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_SDL2}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	)
 
 
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_SDL2}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	)
 
-
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}	PRIVATE
 	${CONAN_LIBS_SDL2}
 	)  

Other/win/libsharememory/CMakeLists.txt

@@ -10,7 +10,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	)
 

Other/win/libvideoframework/CMakeLists.txt

@@ -108,32 +108,18 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} STATIC ${${MODULE_PREFIX}_SRCS})
 
-#add_precompiled_header(${MODULE_NAME} precompile.h SOURCE_CXX precompile.cpp FORCEINCLUDE)
-
-
-
-
 target_include_directories(${MODULE_NAME} PRIVATE
-	${RVC_COMMON_INCLUDE_DIR}
+	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
-	${RVC_TOOLKIT_INCLUDE_DIR}
-	${RVC_COMMON_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${OTHER_LIB_PLATFORM_BASE_DIR}/libvideohorflip
     ${OTHER_LIB_PLATFORM_BASE_DIR}/rvcmediacommon
     ${CONAN_INCLUDE_DIRS_LIBYUV}
 	)
 
-message(STATUS "ffmpeg include dir is ${CONAN_LIB_DIRS_LIBYUV}")
-message(STATUS "toolkit include dir is ${RVC_TOOLKIT_INCLUDE_DIR}")
-message(STATUS "framework root include dir is ${CONAN_RVCFRAMEWORK_ROOT}")
-message(STATUS "common include dir is ${RVC_COMMON_INCLUDE_DIR}")
-
 
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
     ${CONAN_LIB_DIRS_LIBYUV}
 	)
 

Other/win/libvideohorflip/CMakeLists.txt

@@ -37,13 +37,11 @@ endif(WIN32)
 
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_DIRECTSHOW}
 	)
 
 target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_DIRECTSHOW}
 	)
 

Other/win/libvideoqueue/CMakeLists.txt

@@ -1,7 +1,7 @@
 set(MODULE_NAME "videoqueue")
 set(MODULE_PREFIX "LIB_VIDEOQUEUE_FUNC")
 if(MSVC)
-    set(STDAFXCPP ${RVC_COMMON_INCLUDE_DIR}/stdafx.cpp)
+    set(STDAFXCPP ${RVC_FRAMEWORK_INCLUDE_DIR}/stdafx.cpp)
 else()
 	 set(STDAFXCPP )
 endif(MSVC)
@@ -21,14 +21,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libsharememory
     )
 
-if(MSVC)
-#add_precompiled_header(${MODULE_NAME} ${RVC_COMMON_INCLUDE_DIR}/stdafx.h SOURCE_CXX ${RVC_COMMON_INCLUDE_DIR}/stdafx.cpp FORCEINCLUDE)
-endif(MSVC)
-
-
-
 target_include_directories(${MODULE_NAME} PRIVATE
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_IPP}
 	${OTHER_LIB_PLATFORM_BASE_DIR}/libvideoframework
@@ -37,12 +30,10 @@ target_include_directories(${MODULE_NAME} PRIVATE
 message(STATUS "rvc common include dir is ${RVC_COMMON_INCLUDE_DIR}")
 
 target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_IPP}
 	)
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}
-#	${SPBASE_LIB}
 	${CONAN_PKG_LIBS_IPP}
 	sharememory
 	)  

Other/win/libvideorecord/CMakeLists.txt

@@ -25,7 +25,6 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 message(STATUS "freetype2: ${CONAN_INCLUDE_DIRS_FREETYPE}")
 
 target_include_directories(${MODULE_NAME} PRIVATE
-	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_INCLUDE_DIRS_FREETYPE}

Other/win/libvideorender/CMakeLists.txt

@@ -22,13 +22,11 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_SDL2}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
 	)
 
 
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_SDL2}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	)
 
 

Other/win/libwmpplayer/CMakeLists.txt

@@ -18,7 +18,7 @@ message(STATUS "MFC_DIR = ${MFC_INCLUDE_LIBRARIES}")
 
 
 if(MSVC)
-    set(STDAFXCPP ${RVC_COMMON_INCLUDE_DIR}/stdafx.cpp)
+    set(STDAFXCPP ${RVC_FRAMEWORK_INCLUDE_DIR}/stdafx.cpp)
 else()
 	 set(STDAFXCPP )
 endif(MSVC)

Other/win/showdev/CMakeLists.txt

@@ -20,7 +20,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}
 	${CONAN_INCLUDE_DIRS_PORTAUDIO}/common
 	${RVC_TOOLKIT_INCLUDE_DIR}
-	${CONAN_RVCFRAMEWORK_ROOT}/include
+	${RVC_FRAMEWORK_INCLUDES_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
 	${CONAN_INCLUDE_DIRS_SPANDSP}
 	)
@@ -28,7 +28,6 @@ target_include_directories(${MODULE_NAME} PRIVATE
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_APACHE-APR}
 	${CONAN_LIB_DIRS_PORTAUDIO}
-	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CONAN_LIB_DIRS_LIB8K}
 	${CONAN_LIB_DIRS_SPANDSP}

Tool/CMakeLists.txt

@@ -13,20 +13,13 @@ else()
     set(TOOLKIT_LIB libtoolkit)
 endif(RVC_DEBUG_MODE)
 set(WINPR_LIB winpr2)
+
 set(MODULE_BASE_LIBS ${SPBASE_LIB} ${TOOLKIT_LIB})
 set(MODULE_BASE_ALL_LIBS ${MODULE_BASE_LIBS} ${RVCCOMM_LIB}) 
+
 if(NOT MSVC)
     list(APPEND MODULE_BASE_LIBS ${WINPR_LIB})
 endif(NOT MSVC)
-set(MODULE_BASE_INCLUDES ${ModuleCommonHeadPath} ${RVC_TOOLKIT_INCLUDE_DIR})
-
-SET(RVC_COMMON_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/Common PARENT_SCOPE)
-SET(RVC_TOOLKIT_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit PARENT_SCOPE)
-SET(RVC_WINPR_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include)
-
-SET(RVC_FRAMEWORK_LIBRARIES_DIR ${CONAN_LIB_DIRS_RVCFRAMEWORK})
-SET(RVC_FRAMEWORK_INCLUDES_DIR ${RVC_COMMON_INCLUDE_DIR} 
-    ${RVC_TOOLKIT_INCLUDE_DIR} ${RVC_WINPR_INCLUDE_DIR})
 
 ######################## Framework lib CMake define end ########################
 

Tool/guardian/CMakeLists.txt

@@ -14,14 +14,10 @@ target_include_directories(${MODULE_NAME} PRIVATE
     ${OTHER_LIB_BASE_DIR}/liblog4rvcother
 )
 
-target_link_directories(${MODULE_NAME} PRIVATE
-    ${RVC_FRAMEWORK_LIBRARIES_DIR}
-)
-
 if(MSVC)
-    target_link_libraries(${MODULE_NAME} ${WINPR_LIB} ${TOOLKIT_LIB} Ws2_32 log4rvcother)
+    target_link_libraries(${MODULE_NAME} PRIVATE ${TOOLKIT_LIB} Ws2_32 log4rvcother)
 else()
-    target_link_libraries(${MODULE_NAME} ${WINPR_LIB} ${TOOLKIT_LIB} log4rvcother)
+    target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_LIB} ${TOOLKIT_LIB} log4rvcother)
 endif(MSVC)
 
 install(TARGETS ${MODULE_NAME} 

Tool/sprestart/CMakeLists.txt

@@ -7,11 +7,11 @@ target_include_directories(${MODULE_NAME} PRIVATE
     ${RVC_WINPR_INCLUDE_DIR}
 )
 
-target_link_directories(${MODULE_NAME} PRIVATE
-    ${RVC_FRAMEWORK_LIBRARIES_DIR}
-)
-
-target_link_libraries(${MODULE_NAME} ${WINPR_LIB} ${TOOLKIT_LIB} Ws2_32)
+if(MSVC)
+    target_link_libraries(${MODULE_NAME} PRIVATE ${TOOLKIT_LIB} Ws2_32)
+else()
+    target_link_libraries(${MODULE_NAME} PRIVATE ${WINPR_LIB} ${TOOLKIT_LIB})
+endif(MSVC)
 
 install(TARGETS ${MODULE_NAME} 
     RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"

addin/cmake/BuildMakeSettings.cmake

@@ -1,14 +1,27 @@
 SET(RVCFRAMEWORK_SOURCES_DIR ${PROJECT_SOURCE_DIR}/Framework)
-SET(RVC_COMMON_INCLUDE_DIR ${RVCFRAMEWORK_SOURCES_DIR}/Common)
+SET(RVC_FRAMEWORK_INCLUDE_DIR ${RVCFRAMEWORK_SOURCES_DIR}/Common)
 SET(RVC_TOOLKIT_INCLUDE_DIR ${RVCFRAMEWORK_SOURCES_DIR}/libtoolkit)
-SET(RVC_WINPR_INCLUDE_DIR ${RVCFRAMEWORK_SOURCES_DIR}/winpr/include)
+SET(RVC_WINPR_SOURCE_INCLUDE_DIR ${RVCFRAMEWORK_SOURCES_DIR}/winpr/include)
+SET(RVC_WINPR_BINARY_INCLUDE_DIR ${PROJECT_BINARY_DIR}/Framework/winpr/include)
+SET(RVC_WINPR_INCLUDE_DIR ${RVC_WINPR_SOURCE_INCLUDE_DIR} ${RVC_WINPR_BINARY_INCLUDE_DIR})
+SET(RVC_COMMON_INCLUDE_DIR ${RVC_FRAMEWORK_INCLUDE_DIR})
 SET(RVC_FRAMEWORK_INCLUDES_DIR ${RVC_COMMON_INCLUDE_DIR} 
     ${RVC_TOOLKIT_INCLUDE_DIR} ${RVC_WINPR_INCLUDE_DIR})
 
 SET(ThirdPartyLib "${PROJECT_SOURCE_DIR}/ThirdParty/Release")
-
 SET(ThirdPartyHeadRoot "${PROJECT_SOURCE_DIR}/ThirdParty/Include")
+SET(DevHeadPath "${PROJECT_SOURCE_DIR}/DevAdapter/include")
+set(MODULE_BASE_DIR "${PROJECT_SOURCE_DIR}/Module")
+SET(ModuleCommonHeadPath "${MODULE_BASE_DIR}/include")
+SET(MODULE_MICRO_SERVICES_INCLUDE_DIR "${ModuleCommonHeadPath}/microservices")
+set(OTHER_LIB_BASE_DIR "${PROJECT_SOURCE_DIR}/Other")
+if(MSVC)
+	set(OTHER_LIB_PLATFORM_BASE_DIR "${OTHER_LIB_BASE_DIR}/win")
+else()
+	set(OTHER_LIB_PLATFORM_BASE_DIR "${OTHER_LIB_BASE_DIR}/unix")
+endif(MSVC)
 
+set(Tool_BASE_DIR "${PROJECT_SOURCE_DIR}/Tool")
 macro(rvc_set_library_output_dir _dir)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${_dir})
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${_dir})

addin/cmake/ModMakeSettings.cmake

@@ -1,17 +0,0 @@
-SET(DevHeadPath "${PROJECT_SOURCE_DIR}/DevAdapter/include")
-
-set(MODULE_BASE_DIR "${PROJECT_SOURCE_DIR}/Module")
-
-SET(ModuleCommonHeadPath "${MODULE_BASE_DIR}/include")
-
-SET(MODULE_MICRO_SERVICES_INCLUDE_DIR "${ModuleCommonHeadPath}/microservices")
-
-
-set(OTHER_LIB_BASE_DIR "${PROJECT_SOURCE_DIR}/Other")
-if(MSVC)
-set(OTHER_LIB_PLATFORM_BASE_DIR "${OTHER_LIB_BASE_DIR}/win")
-else()
-set(OTHER_LIB_PLATFORM_BASE_DIR "${OTHER_LIB_BASE_DIR}/unix")
-endif(MSVC)
-
-set(Tool_BASE_DIR "${PROJECT_SOURCE_DIR}/Tool")

addin/conan/CMakeLists.txt

@@ -0,0 +1,9 @@
+cmake_minimum_required(VERSION 2.8.11)
+project(cmake_wrapper)
+
+include(conanbuildinfo.cmake)
+conan_basic_setup()
+
+include(CheckIncludeFile)
+
+add_subdirectory("source_subfolder")

addin/conan/linux.conanconf

@@ -0,0 +1,4 @@
+# use it as $ conan install -pr=myprofile
+[settings]
+os_build=Linux
+arch_build=x86_64

addin/conan/linux2aarm64.conanconf

@@ -0,0 +1,26 @@
+toolchain=/usr/aarch64-linux-gnu
+target_host=aarch64-linux-gnu
+cc_compiler=gcc
+cxx_compiler=g++
+
+[env]
+CONAN_CMAKE_FIND_ROOT_PATH=$toolchain
+CHOST=$target_host
+AR=$target_host-ar
+AS=$target_host-as
+RANLIB=$target_host-ranlib
+CC=$target_host-$cc_compiler
+CXX=$target_host-$cxx_compiler
+STRIP=$target_host-strip
+RC=$target_host-windres
+
+[settings]
+# We are cross-building to Windows
+os=Windows
+arch=x86_64
+compiler=gcc
+
+# Adjust to the gcc version of your MinGW package
+compiler.version=7.3
+compiler.libcxx=libstdc++11
+build_type=Release

addin/conan/win.conanconf

@@ -0,0 +1,9 @@
+# use it as $ conan install -pr=myprofile
+[settings]
+os=Windows
+os_build=Windows
+arch=x86
+arch_build=x86_64
+compiler=Visual Studio
+compiler.runtime=MD
+compiler.version=16