Procházet zdrojové kódy

#IQRV #comment [CMake] 过滤.a文件

gifur před 4 roky
rodič
revize
aa5a6cb2b0

+ 1 - 1
DevAdapter/CMakeLists.txt

@@ -129,7 +129,7 @@ if(RVC_INTEGRATE_BUILD)
 	    file(GLOB RVC_DEP_BIN_FILES "${dep_dir}/*")
         list(REMOVE_DUPLICATES RVC_DEP_BIN_FILES)
         message(STATUS "before file: ${RVC_DEP_BIN_FILES}")
-        list(FILTER RVC_DEP_BIN_FILES EXCLUDE REGEX ".*\.a$")
+        list(FILTER RVC_DEP_BIN_FILES EXCLUDE REGEX ".*\\.a$")
         message(STATUS "after file: ${RVC_DEP_BIN_FILES}")
         foreach(bin_file ${RVC_DEP_BIN_FILES})
             if(IS_DIRECTORY ${bin_file})

+ 4 - 1
DevAdapter/cmbsz/CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 2.8)
 
-project(cmbsz C CXX)
+
+STRING( REGEX REPLACE ".*/(.*)" "\\1" CURRENT_FOLDER ${CMAKE_CURRENT_SOURCE_DIR} )
+message(STATUS "CURRENT_FOLDER : ${CURRENT_FOLDER}")
+project(${CURRENT_FOLDER} C CXX)
 
 set(CMAKE_COLOR_MAKEFILE ON)
 

+ 13 - 12
addin/hardwarecfg/uos/root.ini.nantian

@@ -73,13 +73,7 @@ Vendor=nantian
 Version=1
 Batch=1
 Port=2
-Baudrate=115200
-;Vendor=
-;Version=
-;Batch=
-;Baudrate=19200
-
-
+Baudrate=38400
 
 [Device.CardSwiper]
 # parameters such as port 
@@ -110,8 +104,8 @@ Baudrate=0
 Vendor=nantian
 Version=1
 Batch=1
-Port=0
-Baudrate=0
+Port=7
+Baudrate=9600
 PortNum=4
 InOutDir=65280
 
@@ -121,8 +115,8 @@ InOutDir=65280
 Vendor=nantian
 Version=1
 Batch=1
-Port=4
-Baudrate=115200
+Port=5
+Baudrate=9600
 Checkdata=0000000000000000
 Keysn=000
 
@@ -130,7 +124,7 @@ Keysn=000
 Vendor=nantian
 Version=1
 Batch=1
-Port=5
+Port=4
 Baudrate=2400
 
 [Device.WatchDog]
@@ -150,3 +144,10 @@ Vendor=nantian
 Version=1
 Batch=1
 
+[Device.ThermalPrint]
+Vendor=nantian
+Version=1
+Batch=1
+Port=3
+Baudrate=38400
+