Z991239-968 #comment feat: 封装获取宏的配置文件，并将框架版本更新为1.0.5-dev4

CMakeLists.txt

@@ -141,7 +141,7 @@ endif(CONAN_EXPORTED)
 
 
 include(conan)
-conan_cmake_run(REQUIRES RvcFramework/1.0.5-dev1@LR04.02_FrameworkLib/testing
+conan_cmake_run(REQUIRES RvcFramework/1.0.5-dev4@LR04.02_FrameworkLib/testing
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
 
@@ -396,7 +396,9 @@ endif(SIMULATE_ON)#end simulate
 
 add_subdirectory(Other)
 add_subdirectory(Module)
-add_subdirectory(DevAdapter)
+if(BUILD_DEVADAPTER)
+	add_subdirectory(DevAdapter)
+endif(BUILD_DEVADAPTER)
 
 set(CMAKE_INSTALL_LOCAL_ONLY ON)
 # Config package information.

Module/CMakeLists.txt

@@ -132,6 +132,10 @@ macro(deploy_module _module_prefix _module_name)
     set_property(TARGET ${_module_name} PROPERTY FOLDER "module/")
 endmacro(deploy_module)
 
+if(BUILD_TESTING)
+	add_subdirectory(include/test)
+endif()
+
 if(BUILD_MOUDLE_TEST)
     message(STATUS "build module test case")
 endif(BUILD_MOUDLE_TEST)
@@ -139,15 +143,7 @@ endif(BUILD_MOUDLE_TEST)
 set(MODULE_CONAN_DEP_LIBS)
 
 # 遍历实体
- file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
-
- foreach(dir ${all_valid_subdirs})
-  	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
-  		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
-  		message(STATUS "add module ${dir_trimmed}")
-  		add_subdirectory(${dir_trimmed})
-    endif()
- endforeach(dir)
+rvc_add_all_cmake_subdirectory()
 
 # 汇总要依赖拷贝的第三方库
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)

Other/CMakeLists.txt

@@ -2,17 +2,5 @@ if(SIMULATE_ON)
 	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
 endif(SIMULATE_ON)
 
-add_subdirectory("libscreencodec")
-add_subdirectory("acmstrenc")
-add_subdirectory("acmstrdec")
-add_subdirectory("libbizchan")
 
-#file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
-
-#foreach(dir ${all_valid_subdirs})
-#	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
-#		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
-#		message(STATUS "Adding other component ${dir_trimmed}")
-#		add_subdirectory(${dir_trimmed})
-#	endif()
-#endforeach(dir)
+rvc_add_all_cmake_subdirectory()

addin/cmake/BuildMakeSettings.cmake

@@ -32,4 +32,15 @@ if(${var})
 else()
 	set_target_properties(${MODULE_NAME} PROPERTIES COMPILE_DEFINITIONS "${_def}")
 endif()
-endmacro(rvc_target_add_definitions)
+endmacro(rvc_target_add_definitions)
+
+macro(rvc_add_all_cmake_subdirectory)
+file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
+foreach(dir ${all_valid_subdirs})
+	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
+		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
+		message(STATUS "Adding other component ${dir_trimmed}")
+		add_subdirectory(${dir_trimmed})
+	endif()
+endforeach(dir)
+endmacro(rvc_add_all_cmake_subdirectory)

addin/cmake/ConfigOptions.cmake

@@ -21,4 +21,6 @@ option(WITH_DEBUG_SYMBOLS "Pack debug symbols to installer" OFF)
 
 option(WITH_THIRD_PARTY "Build third-party components" ON)
 
-option(SIMULATE_ON "/run/version/1.2.3.4/" ON)
+option(SIMULATE_ON "/run/version/1.2.3.4/" ON)
+
+option(BUILD_DEVADAPTER "whether build device adapter or not" ON)