From d85a60308e8976f48cc78ae9ba2c7136a4cbd037 Mon Sep 17 00:00:00 2001
From: huangxin <huangxin@cmhi.chinamobile.com>
Date: Fri, 29 Nov 2019 17:09:09 +0800
Subject: [PATCH] =?UTF-8?q?Mod=20=20aaa-12=20=E6=9B=B4=E6=96=B0CMake?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=20RCA=EF=BC=9A=20SOL=EF=BC=9A=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=BA=EF=BC=9Ahuangxin=20=E6=A3=80=E8=A7=86?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=9Ahuangxin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 unit_test/CMakeLists.txt     | 12 +++---------
 unit_test/test/json_test.cpp |  5 +++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/unit_test/CMakeLists.txt b/unit_test/CMakeLists.txt
index 24de945..5e4cd78 100644
--- a/unit_test/CMakeLists.txt
+++ b/unit_test/CMakeLists.txt
@@ -37,12 +37,6 @@ AUX_SOURCE_DIRECTORY(./test TEST_SRC)
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 # Now simply link against gtest or gtest_main as needed. Eg
-add_executable(ztp_unit ${TEST_SRC})
-
-#if(ZTP_LIBRARY_FOUND)
-target_link_libraries(ztp_unit ${ZTP_LIBRARY} ztp gtest_main)
-#else()
-#target_link_libraries(ztp_unit gtest_main ztp)
-#endif()
-
-add_test(NAME ztp_unit_test COMMAND ztp_unit)
\ No newline at end of file
+ADD_EXECUTABLE(ztp_unit ${TEST_SRC})
+TARGET_LINK_LIBRARIES(ztp_unit ${ZTP_LIBRARY} ztp gtest_main)
+ADD_TEST(NAME ztp_unit_test COMMAND ztp_unit)
\ No newline at end of file
diff --git a/unit_test/test/json_test.cpp b/unit_test/test/json_test.cpp
index 0c532fc..522fe2c 100644
--- a/unit_test/test/json_test.cpp
+++ b/unit_test/test/json_test.cpp
@@ -2,10 +2,11 @@
 // Created by xajhu on 2019/11/29 0029.
 //
 
-#include "gtest/gtest.h"
 #include <iostream>
 using namespace std;
 
+#include "gtest/gtest.h"
+
 extern "C" {
 #include "json_interface.h"
 }
@@ -28,7 +29,7 @@ TEST(json_encode_test, retOK)
     ASSERT_EQ(0,ret);
 }
 
-int main(int argc, char** argv)
+auto main(int argc, char* argv[]) -> int
 {
     int ret;