From 155edbee92234699b1e4a2efe91f337906b2abff Mon Sep 17 00:00:00 2001 From: fancy <258828110.@qq.com> Date: Sun, 10 Sep 2023 07:09:00 -0700 Subject: [PATCH] Improve build. --- .gitignore | 2 +- Makefile | 10 +++++----- README.md | 2 +- build/cmake/Makefile | 6 +++--- build/global_config.cmake | 2 +- hal/CMakeLists.txt | 4 ++-- middleware/StateMachine/CMakeLists.txt | 4 ++-- test/utils/Log/CMakeLists.txt | 4 ++-- utils/Log/CMakeLists.txt | 4 ++-- utils/LogC/CMakeLists.txt | 4 ++-- utils/StatusCode/CMakeLists.txt | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index d0c7251..c939ded 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ .vscode -cmake-shell-linux/ +cmake-shell/ external/gtest/googletest-release-1.11.0/ external/libconfig/libconfig-1.7.3/ out/ \ No newline at end of file diff --git a/Makefile b/Makefile index 0d70e8a..e365645 100755 --- a/Makefile +++ b/Makefile @@ -26,11 +26,11 @@ clean_code: @rm -rf !(Makefile) all:cmake - $(MAKE) -C cmake-shell-linux all + $(MAKE) -C cmake-shell all clean: - @if [ -d "cmake-shell-linux" ]; then \ - echo "cmake-shell-linux exist"; \ - make -C cmake-shell-linux clean; \ + @if [ -d "cmake-shell" ]; then \ + echo "cmake-shell exist"; \ + make -C cmake-shell clean; \ fi @echo "IPC clean." @rm -rf external/gtest/googletest-release-1.11.0 \ @@ -39,4 +39,4 @@ clean: external/openssl/build \ external/curl/curl-8.1.2 \ out \ - cmake-shell-linux \ No newline at end of file + cmake-shell \ No newline at end of file diff --git a/README.md b/README.md index a754cd2..c040b82 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,6 @@ ``` make clean // 如果之前有跨平台编译过，需要先make clean make cmake // 构建源码，生成Makefile文件 -cd cmake-shell-linux/ // 在中间文件目录进行编译，把所有中间文件创建在此目录 +cd cmake-shell/ // 在中间文件目录进行编译，把所有中间文件创建在此目录 make // 编译全部输出构建文件 ``` \ No newline at end of file diff --git a/build/cmake/Makefile b/build/cmake/Makefile index e78d1db..66328fe 100644 --- a/build/cmake/Makefile +++ b/build/cmake/Makefile @@ -1,8 +1,8 @@ all: - @mkdir -p ../../cmake-shell-linux;\ - cd ../../cmake-shell-linux;\ + @mkdir -p ../../cmake-shell;\ + cd ../../cmake-shell;\ pwd;\ cmake -DCMAKE_TOOLCHAIN_FILE="./build/cmake/toolchain/linux.toolchain.cmake" ..;\ cd .. clean: - rm -rf ../../cmake-shell-linux \ No newline at end of file + rm -rf ../../cmake-shell \ No newline at end of file diff --git a/build/global_config.cmake b/build/global_config.cmake index 1841973..ae227b7 100755 --- a/build/global_config.cmake +++ b/build/global_config.cmake @@ -43,4 +43,4 @@ readability-identifier-naming") set(CLANG_TIDY_CHECKS "${CLANG_TIDY_CHECKS},-clang-diagnostic-error") set(CLANG_TIDY_CONFIG "-header-filter=\'.*\'") -set(CLANG_TIDY_CONFIG "${CLANG_TIDY_CONFIG} -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux") \ No newline at end of file +set(CLANG_TIDY_CONFIG "${CLANG_TIDY_CONFIG} -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell") \ No newline at end of file diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index 0a96fec..d69b078 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -42,7 +42,7 @@ add_custom_target( ${ABSTRACT_SRC_FILES} ${IMPL_SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux + -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell # -- -I /usr/include/linux/ -X c++ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR_IPCSDK}/hal ) @@ -51,6 +51,6 @@ add_custom_command( TARGET ${ABSTRACT_TARGET} PRE_BUILD COMMAND make hal_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ + WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/middleware/StateMachine/CMakeLists.txt b/middleware/StateMachine/CMakeLists.txt index 7609b19..425150c 100644 --- a/middleware/StateMachine/CMakeLists.txt +++ b/middleware/StateMachine/CMakeLists.txt @@ -35,13 +35,13 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux + -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/StateMachine ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make StateMahince_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ + WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/test/utils/Log/CMakeLists.txt b/test/utils/Log/CMakeLists.txt index 7b1a99d..b1e6d2b 100644 --- a/test/utils/Log/CMakeLists.txt +++ b/test/utils/Log/CMakeLists.txt @@ -43,13 +43,13 @@ add_custom_target( ${CLANG_TIDY_CONFIG} # --line-filter='[{\"name\":\"${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googletest/include/getest/gtest.h\"}]' --line-filter='[{\"name\":\"${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googletest/include/getest/*.h\"}]' - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux + -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/Log ) add_custom_command( TARGET ${TARGET_NAME} PRE_BUILD COMMAND make LogTest_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ + WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/utils/Log/CMakeLists.txt b/utils/Log/CMakeLists.txt index cd4d80e..4b3325c 100644 --- a/utils/Log/CMakeLists.txt +++ b/utils/Log/CMakeLists.txt @@ -38,7 +38,7 @@ add_custom_target( ${IMPL_SRC_FILES} ${ABSTRACT_SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux + -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/Log ) add_custom_command( @@ -46,6 +46,6 @@ add_custom_command( # TARGET ${ABSTRACT_TARGET} PRE_BUILD COMMAND make Log_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ + WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ ) endif() \ No newline at end of file diff --git a/utils/LogC/CMakeLists.txt b/utils/LogC/CMakeLists.txt index b89413e..d21e5b5 100644 --- a/utils/LogC/CMakeLists.txt +++ b/utils/LogC/CMakeLists.txt @@ -40,7 +40,7 @@ add_custom_target( ${CLANG_TIDY_CONFIG} --header-filter=.* --system-headers=false - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux + -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell WORKING_DIRECTORY ${CMAKE_SOURCE_DIR_IPCSDK}/utils/LogC ) @@ -49,5 +49,5 @@ add_custom_target( # TARGET ${ABSTRACT_TARGET} # PRE_BUILD # COMMAND make log_code_check -# WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ +# WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ # ) \ No newline at end of file diff --git a/utils/StatusCode/CMakeLists.txt b/utils/StatusCode/CMakeLists.txt index c1f24aa..8ee7b8a 100644 --- a/utils/StatusCode/CMakeLists.txt +++ b/utils/StatusCode/CMakeLists.txt @@ -31,7 +31,7 @@ add_custom_target( --system-headers=false ${SRC_FILES} ${CLANG_TIDY_CONFIG} - -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux + -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/StatusCode ) add_custom_command( @@ -39,6 +39,6 @@ add_custom_command( # TARGET ${ABSTRACT_TARGET} PRE_BUILD COMMAND make StatusCode_code_check - WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ + WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/ ) endif() \ No newline at end of file