diff --git a/CMakeLists.txt b/CMakeLists.txt index d83982c..d6ea61e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,20 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 3.10) - -project(ztp_client) - -AUX_SOURCE_DIRECTORY(./log ZTP_SRC) -AUX_SOURCE_DIRECTORY(./confingure ZTP_SRC) -AUX_SOURCE_DIRECTORY(./http ZTP_SRC) -AUX_SOURCE_DIRECTORY(./json_engine ZTP_SRC) - -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") - -LINK_LIBRARIES(-lpthread -lconfig -lcurl -lcjson) - -ADD_EXECUTABLE(ztp_client ${ZTP_SRC} ztp_main.c) - +CMAKE_MINIMUM_REQUIRED(VERSION 3.10) + +if(PLAT_ARM64) +INCLUDE(${CMAKE_SOURCE_DIR}/projects/arm64.cmake) +endif() + +project(ztp_client) + +AUX_SOURCE_DIRECTORY(./log ZTP_SRC) +AUX_SOURCE_DIRECTORY(./confingure ZTP_SRC) +AUX_SOURCE_DIRECTORY(./http ZTP_SRC) +AUX_SOURCE_DIRECTORY(./json_engine ZTP_SRC) + +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") \ No newline at end of file diff --git a/confingure/prase_config.c b/confingure/prase_config.c index 9854057..e2577fd 100644 --- a/confingure/prase_config.c +++ b/confingure/prase_config.c @@ -5,8 +5,11 @@ #include #include #include + +#ifdef MONITOR_ZTP_CFG_FILE #include #include +#endif #include "common.h" #include "log.h" diff --git a/log/log.c b/log/log.c index f98c2b4..3e9b580 100644 --- a/log/log.c +++ b/log/log.c @@ -212,6 +212,8 @@ static void *__logOutputThread(void *p) pthread_detach(pthread_self()); g_bEnableLog = TRUE; + + return NULL; } /**