From 60155399d7d93ad2b7f4a187f22a2cdec99f2973 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 12 Aug 2023 22:52:23 +0800 Subject: [PATCH] update --- .gitmodules | 6 ++++++ CMakeLists.txt | 32 +++----------------------------- build.sh | 5 +++++ cmakelib/.mark | 0 iflytopcpp | 1 + iflytoplinux/.mark | 0 src/main.cpp | 5 +++++ zcmake | 1 + 8 files changed, 21 insertions(+), 29 deletions(-) create mode 100644 .gitmodules mode change 100644 => 100755 build.sh delete mode 100644 cmakelib/.mark create mode 160000 iflytopcpp delete mode 100644 iflytoplinux/.mark create mode 100644 src/main.cpp create mode 160000 zcmake diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7b82f2a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "iflytopcpp"] + path = iflytopcpp + url = zwsd@192.168.1.3:z2nd_lib/iflytopcpp.git +[submodule "zcmake"] + path = zcmake + url = zwsd@192.168.1.3:zwsd_common_lib/zcmake.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 142d50a..42815dc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,37 +35,11 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${C_CPP_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${C_CPP_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pessimizing-move") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reorder") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++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) -zadd_public(DEFINES ${DEP_DEFINE}) -zadd_public(SRC ${DEP_SRC}) -# 设置当前工程依赖的头文件路径和链接的库文件 -# 如何 BUILD_ON_HOST == true, 则include cmakepc.cmake -if(BUILD_ON_HOST) - # - # 编译PC版本的相关测试代码，具体使用参考README.md - # - message("IFLYBUILD_HOST_PUBLIC_INCLUDE_DIRECTORIES: ${IFLYBUILD_HOST_PUBLIC_INCLUDE_DIRECTORIES}") - zadd_public(INCLUDE_DIRECTORIES ${IFLYBUILD_HOST_PUBLIC_INCLUDE_DIRECTORIES}) - zadd_public(LINK_DIRECTORIES ${IFLYBUILD_HOST_PUBLIC_LINK_DIRECTORIES}) - zadd_public(LINK_LIBRARIES ${IFLYBUILD_HOST_PUBLIC_LINK_LIBS}) - zadd_public(LINK_LIBRARIES pthread m) - include(./.project/cmake/host.cmake) - return() -else() - # - # 编译嵌入式版本的相关代码，具体使用参考README.md - # - zadd_public(INCLUDE_DIRECTORIES - ${IFLYBUILD_TARGET_PUBLIC_INCLUDE_DIRECTORIES}) - zadd_public(LINK_DIRECTORIES ${IFLYBUILD_TARGET_PUBLIC_LINK_DIRECTORIES}) - zadd_public(LINK_LIBRARIES ${IFLYBUILD_TARGET_PUBLIC_LINK_LIBS}) - zadd_public(LINK_LIBRARIES pthread m) - include(./.project/cmake/target.cmake) - return() -endif() +zadd_executable(TARGET app.out SRC ${VAR_APP_SOURCE}) diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 index e69de29..fbdf561 --- a/build.sh +++ b/build.sh @@ -0,0 +1,5 @@ +mkdir build +cd build +cmake .. \ + -DCMAKE_C_COMPILER='aarch64-linux-gnu-gcc' \ + -DCMAKE_CXX_COMPILER='aarch64-linux-gnu-g++' \ diff --git a/cmakelib/.mark b/cmakelib/.mark deleted file mode 100644 index e69de29..0000000 diff --git a/iflytopcpp b/iflytopcpp new file mode 160000 index 0000000..3b6ad55 --- /dev/null +++ b/iflytopcpp @@ -0,0 +1 @@ +Subproject commit 3b6ad55660aa6aae464021efe19f6b698f03047f diff --git a/iflytoplinux/.mark b/iflytoplinux/.mark deleted file mode 100644 index e69de29..0000000 diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..be837a4 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,5 @@ +int main(int argc, char const *argv[]) +{ + + return 0; +} diff --git a/zcmake b/zcmake new file mode 160000 index 0000000..a68cdff --- /dev/null +++ b/zcmake @@ -0,0 +1 @@ +Subproject commit a68cdff5206c9c2c43b40793b381aaf9e1bcdac4