#IQRV #comment [DevAdapter]更新Demo

DevAdapter/cmbsz/CMakeLists.txt

@@ -1,29 +1,16 @@
 cmake_minimum_required(VERSION 2.8)
 
-
-STRING( REGEX REPLACE ".*/(.*)" "\\1" CURRENT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR} )
-message(STATUS "CURRENT_FOLDER : ${CURRENT_FOLDER}")
-project(${CURRENT_FOLDER} C CXX)
+STRING( REGEX REPLACE ".*/(.*)" "\\1" CURRENT_VENDOR ${CMAKE_CURRENT_SOURCE_DIR} )
+message(STATUS "CURRENT_VENDOR : ${CURRENT_VENDOR}")
+project(${CURRENT_VENDOR} C CXX)
 
 set(CMAKE_COLOR_MAKEFILE ON)
 
-# 放置有源码的适配器依赖库工程文件
-set(VENDOR_CURRENT_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps")
-set(VENDOR_CURRENT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include")
-set(VENDOR_CURRENT_ASSET_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
-
-set(VENDOR_CURRENT_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/${DIFF_PLATFORM_SUB_DIR}")
-set(VENDOR_CURRENT_BIN_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bin/${DIFF_PLATFORM_SUB_DIR}")
-
- file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
+# VENDOR_CURRENT_{DEPS|INCLUDE|ASSET|LIB|BIN}_DIR 等定义已集成到该宏内
+rvc_define_dependen_dirs()
 
- 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)
+# 遍历当前目录下带有CMakeLists.txt文件的文件夹
+rvc_traverse_sub_cmake_dirs()
 
 #  =-=-=-=-=-=-=-=-=-= {VendorName}/CMakeLists.txt 文件最后必须声明如下内容=-=-=-=-=-=-=-=-=-=-=-=-=-==-=-=
 rvc_aggereate_runtime_file()

DevAdapter/cmbsz/FingerPrint.1.1/CMakeLists.txt

@@ -2,7 +2,7 @@
 rvc_dev_define_module("FingerPrint")
 
 # rvc_dev_config_library 内需要使用这三个参数，用于拼接输出的适配器文件名称
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/FingerPrint.7.1/CMakeLists.txt

@@ -2,7 +2,7 @@
 rvc_dev_define_module("FingerPrint")
 
 # rvc_dev_config_library 内需要使用这三个参数，用于拼接输出的适配器文件名称
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "7")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/cardissuer.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("CardIssuer")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/cardswiper.1.1/CMakeLists.txt

@@ -2,7 +2,7 @@
 rvc_dev_define_module("CardSwiper")
 
 # rvc_dev_config_library 内需要使用这三个参数，用于拼接输出的适配器文件名称
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/contactlesscard.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("ContactlessCard")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/devctrl.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("DeviceControl")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/gpio.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("Gpio")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/hspscanner.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("HSPScanner")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/idcer.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("IDCertificate")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/pinpad.1.1/CMakeLists.txt

@@ -2,7 +2,7 @@
 rvc_dev_define_module("PinPad")
 
 # rvc_dev_config_library 内需要使用这三个参数，用于拼接输出的适配器文件名称
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/termalprint.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("ThermalPrint")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/ups.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("Ups")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")
 

DevAdapter/cmbsz/watchdog.1.1/CMakeLists.txt

@@ -1,5 +1,5 @@
 rvc_dev_define_module("WatchDog")
-set(${MODULE_PREFIX}_VENDOR "cmbsz")
+set(${MODULE_PREFIX}_VENDOR ${CURRENT_VENDOR})
 set(${MODULE_PREFIX}_VERSION "1")
 set(${MODULE_PREFIX}_BATCH "1")