Browse Source

Z991239-1585 #comment 心跳cmake添加及心跳linux修改 修改 other:心跳cmake添加及心跳linux修改

杨诗友80174847 4 years ago
parent
commit
a6e9ffbe6d
2 changed files with 35 additions and 0 deletions
  1. 34 0
      Module/mod_heartbeat/CMakeLists.txt
  2. 1 0
      Module/mod_heartbeat/HeartBeatFSM.cpp

+ 34 - 0
Module/mod_heartbeat/CMakeLists.txt

@@ -0,0 +1,34 @@
+define_module("HeartBeat")
+
+set(${MODULE_PREFIX}_SRCS
+	HeartBeatFSM.cpp
+	HeartBeatFSM.h
+	mod_heartbeat.cpp
+	mod_heartbeat.h
+	)
+
+set(MOD_VERSION_STRING "1.0.0-dev1")
+add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
+
+target_include_directories(${MODULE_NAME} PRIVATE
+	${ModuleCommonHeadPath}
+	${DevHeadPath}
+	${MODULE_BASE_DIR}/mod_cardissuer
+	${MODULE_BASE_DIR}/mod_pinpad
+	${MODULE_BASE_DIR}/mod_CardReadAdapter
+	${MODULE_BASE_DIR}/mod_IDCertificate
+	${MODULE_BASE_DIR}/mod_ScannerSet
+	${MODULE_BASE_DIR}/mod_selfchecker
+	${MODULE_BASE_DIR}/mod_healthmanager
+)
+
+# 添加实体需要依赖的其他共享库(包括系统库)
+if(MSVC)
+set(${MODULE_PREFIX}_LIBS  Ws2_32 Mswsock AdvApi32 pdh ${SPBASE_LIB} ${RVCCOMM_LIB})
+else()
+set(${MODULE_PREFIX}_LIBS  ${SPBASE_LIB} ${RVCCOMM_LIB})
+endif(MSVC)
+
+target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
+
+deploy_module(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 0
Module/mod_heartbeat/HeartBeatFSM.cpp

@@ -1325,6 +1325,7 @@ Cleanup:
 	}
 	return Error_Succeed;
 #else
+	return Error_Succeed;
 //oiltestlinux
 #endif //RVC_OS_WIN
 }