From a0666c131187114f99f4cb514ac36742477597b0 Mon Sep 17 00:00:00 2001 From: fancy <258828110.@qq.com> Date: Fri, 24 Nov 2023 05:58:00 -0800 Subject: [PATCH] Modify clang tools usage. --- CMakeLists.txt | 5 ++++- build/cmake/toolchain/linux.toolchain.cmake | 6 +++--- build/global_config.cmake | 7 +++++++ doc/clang-tidy_user_guide.md | 12 +++++++++++- doc/design.md | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f9e2292..c0a1d935 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,10 @@ if ("${CLANG_TIDY_SUPPORT}" MATCHES "true") set(CLANG_TIDY_EXE ${CLANG_TIDY_FIND} CACHE STRING INTERNAL) message("CLANG_TIDY_EXE = ${CLANG_TIDY_EXE}") else() - message(FATAL_ERROR "You set support clang-tidy, bug clang-tidy not found.") + # message(FATAL_ERROR "See ${CMAKE_SOURCE_DIR_IPCSDK}/doc.") + message(FATAL_ERROR "You set support clang-tidy, but clang-tidy not found. +See file to install tools: ${IPC_SDK_PATH}/doc/clang-tidy_user_guide.md +Or modify: set(CLANG_TIDY_SUPPORT \"false\") to diable this function in file:${IPC_SDK_PATH}/builde/global_config.cmake") endif() endif() # find the clang-format tools diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake index 9ac90f59..990f4490 100755 --- a/build/cmake/toolchain/linux.toolchain.cmake +++ b/build/cmake/toolchain/linux.toolchain.cmake @@ -35,9 +35,9 @@ set(TEST_COVERAGE "true") set(CURL_OPENSSL_LIB_SHARED_ENABLE "false") # ------------ build curl + openssl end ------------ # # ------------ build clang-tools ------------ # -set(CLANG_TIDY_SUPPORT "true") -set(CLANG_FORMAT_SUPPORT "true") -set(LLVM_PATH "/home/xiaojiazhu/project/tmp/llvm-project") +# set(CLANG_TIDY_SUPPORT "true") +# set(CLANG_FORMAT_SUPPORT "true") +# set(LLVM_PATH "/home/xiaojiazhu/project/tmp/llvm-project") # ------------ build clang-tools end ------------ # # ------------ build IpcConfig ------------ # set(IPC_CONFIG_FILE_PATH "./ipc_config") diff --git a/build/global_config.cmake b/build/global_config.cmake index 7ecc2e91..181d1b02 100755 --- a/build/global_config.cmake +++ b/build/global_config.cmake @@ -49,6 +49,13 @@ set(CLANG_TIDY_CONFIG "${CLANG_TIDY_CONFIG} -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake- # set(CLANG_FORMAT_FILE "${CMAKE_SOURCE_DIR_IPCSDK}/tools/clang-format/.clang-format") set(CLANG_FORMAT_FILE "LLVM ${CMAKE_SOURCE_DIR_IPCSDK}/tools/clang-format/.clang-format") # -------------------------- clang-tidy tools end -------------------------- # +# ------------ build clang-tools ------------ # +if(${LINUX_TEST} MATCHES "true") + set(CLANG_TIDY_SUPPORT "true") + set(CLANG_FORMAT_SUPPORT "true") + set(LLVM_PATH "/home/xiaojiazhu/project/tmp/llvm-project") +endif() +# ------------ build clang-tools end ------------ # # -------------------------- log setting -------------------------- # function(define_file_name target) diff --git a/doc/clang-tidy_user_guide.md b/doc/clang-tidy_user_guide.md index 7720ee0d..049d189f 100644 --- a/doc/clang-tidy_user_guide.md +++ b/doc/clang-tidy_user_guide.md @@ -29,4 +29,14 @@ make -j8 find ./ -name clang-tidy // 确认编译完成 ``` -## 1.2. clang-tidy使用 \ No newline at end of file +## 1.2. clang-tidy使用 +修改配置:< IPC-SDK >/build/global_config.cmake +``` +# ------------ build clang-tools ------------ # +if(${LINUX_TEST} MATCHES "true") + set(CLANG_TIDY_SUPPORT "true") // 使能工具 + set(CLANG_FORMAT_SUPPORT "true") + set(LLVM_PATH "/home/xiaojiazhu/project/tmp/llvm-project") // llvm安装目录 +endif() +# ------------ build clang-tools end ------------ # +``` \ No newline at end of file diff --git a/doc/design.md b/doc/design.md index 4337ec0d..647d7a7d 100644 --- a/doc/design.md +++ b/doc/design.md @@ -19,7 +19,7 @@ 2. PIR sensor; 3. IR leds; 4. 电池(箱体); -5. 启动模式拨键(三键); +5. 单按键启动; 6. 按键:同步/复位/格式化; 7. SD card; 8. usb接口;