Mod aaa-12 重新格式化代码,更新工程配置

RCA:
SOL:
修改人:huangxin
检视人:huangxin
This commit is contained in:
huangxin 2019-11-25 15:37:05 +08:00
parent 8c278cbc64
commit 7bbf06cc6f
3 changed files with 24 additions and 15 deletions

View File

@ -1,16 +1,20 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.10) CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
project(ztp_client) if(PLAT_ARM64)
INCLUDE(${CMAKE_SOURCE_DIR}/projects/arm64.cmake)
AUX_SOURCE_DIRECTORY(./log ZTP_SRC) endif()
AUX_SOURCE_DIRECTORY(./confingure ZTP_SRC)
AUX_SOURCE_DIRECTORY(./http ZTP_SRC) project(ztp_client)
AUX_SOURCE_DIRECTORY(./json_engine ZTP_SRC)
AUX_SOURCE_DIRECTORY(./log ZTP_SRC)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") AUX_SOURCE_DIRECTORY(./confingure ZTP_SRC)
AUX_SOURCE_DIRECTORY(./http ZTP_SRC)
LINK_LIBRARIES(-lpthread -lconfig -lcurl -lcjson) AUX_SOURCE_DIRECTORY(./json_engine ZTP_SRC)
ADD_EXECUTABLE(ztp_client ${ZTP_SRC} ztp_main.c) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
LINK_LIBRARIES(-lpthread -lconfig -lcurl -lcjson)
ADD_EXECUTABLE(ztp_client ${ZTP_SRC} ztp_main.c)
INCLUDE_DIRECTORIES("./include") INCLUDE_DIRECTORIES("./include")

View File

@ -5,8 +5,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h> #include <pthread.h>
#ifdef MONITOR_ZTP_CFG_FILE
#include <sys/inotify.h> #include <sys/inotify.h>
#include <errno.h> #include <errno.h>
#endif
#include "common.h" #include "common.h"
#include "log.h" #include "log.h"

View File

@ -212,6 +212,8 @@ static void *__logOutputThread(void *p)
pthread_detach(pthread_self()); pthread_detach(pthread_self());
g_bEnableLog = TRUE; g_bEnableLog = TRUE;
return NULL;
} }
/** /**