From aa3f9750f78211925c9e2d3bb86344e5254fb793 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 13 Aug 2023 15:50:04 +0800 Subject: [PATCH] update --- .gitmodules | 5 ++++- CMakeLists.txt | 17 +++++++++++++---- iflytoplinuxsdk | 1 + 3 files changed, 18 insertions(+), 5 deletions(-) create mode 160000 iflytoplinuxsdk diff --git a/.gitmodules b/.gitmodules index 51ffd1a..2f96d65 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "zcmake"] path = zcmake - url = zwsd@192.168.1.3:zwsd_common_lib/zcmake.git \ No newline at end of file + url = zwsd@192.168.1.3:zwsd_common_lib/zcmake.git +[submodule "iflytoplinuxsdk"] + path = iflytoplinuxsdk + url = zwsd@192.168.1.3:z2nd_lib/iflytoplinuxsdk.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 7099291..e3a4e56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,9 +40,14 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}") message("PROJECT_NAME: ${PROJECT_NAME}") -file(GLOB_RECURSE VAR_APP_SOURCE # - src/*.cpp # - src/*.c iflytopcpp/*.cpp iflytopcpp/*.c) +file( + GLOB_RECURSE + VAR_APP_SOURCE # + src/*.cpp # + src/*.c # + iflytoplinuxsdk/src/*.cpp # + iflytoplinuxsdk/src/*.c # +) message("VAR_APP_SOURCE: ${VAR_APP_SOURCE}") @@ -51,8 +56,12 @@ zadd_executable( app.out # SRC ${VAR_APP_SOURCE} + + LINK_LIBRARIES + pthread # INCLUDE_DIRECTORIES src - iflytopcpp/core/spdlog/include + iflytoplinuxsdk/src/iflytop/core/spdlog/include/ + iflytoplinuxsdk/src/ ./) diff --git a/iflytoplinuxsdk b/iflytoplinuxsdk new file mode 160000 index 0000000..3edbad7 --- /dev/null +++ b/iflytoplinuxsdk @@ -0,0 +1 @@ +Subproject commit 3edbad7ca097f108cef97f9e89e80da1310263e5