Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Improve build.

Browse Source
This commit is contained in:
fancy 2023-09-10 07:09:00 -07:00
parent 08d451c882
commit 155edbee92
11 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,5 +1,5 @@
.vscode .vscode
cmake-shell-linux/ cmake-shell/
external/gtest/googletest-release-1.11.0/ external/gtest/googletest-release-1.11.0/
external/libconfig/libconfig-1.7.3/ external/libconfig/libconfig-1.7.3/
out/ out/

10
Makefile
View File

@ -26,11 +26,11 @@ clean_code:
@rm -rf !(Makefile) @rm -rf !(Makefile)
all:cmake all:cmake
$(MAKE) -C cmake-shell-linux all $(MAKE) -C cmake-shell all
clean: clean:
@if [ -d "cmake-shell-linux" ]; then \ @if [ -d "cmake-shell" ]; then \
echo "cmake-shell-linux exist"; \ echo "cmake-shell exist"; \
make -C cmake-shell-linux clean; \ make -C cmake-shell clean; \
fi fi
@echo "IPC clean." @echo "IPC clean."
@rm -rf external/gtest/googletest-release-1.11.0 \ @rm -rf external/gtest/googletest-release-1.11.0 \
@ -39,4 +39,4 @@ clean:
external/openssl/build \ external/openssl/build \
external/curl/curl-8.1.2 \ external/curl/curl-8.1.2 \
out \ out \
cmake-shell-linux cmake-shell

2
README.md
View File

@ -10,6 +10,6 @@
``` ```
make clean // 如果之前有跨平台编译过，需要先make clean make clean // 如果之前有跨平台编译过，需要先make clean
make cmake // 构建源码，生成Makefile文件 make cmake // 构建源码，生成Makefile文件
cd cmake-shell-linux/ // 在中间文件目录进行编译，把所有中间文件创建在此目录 cd cmake-shell/ // 在中间文件目录进行编译，把所有中间文件创建在此目录
make // 编译全部输出构建文件 make // 编译全部输出构建文件
``` ```

6
build/cmake/Makefile
View File

@ -1,8 +1,8 @@
all: all:
@mkdir -p ../../cmake-shell-linux;\ @mkdir -p ../../cmake-shell;\
cd ../../cmake-shell-linux;\ cd ../../cmake-shell;\
pwd;\ pwd;\
cmake -DCMAKE_TOOLCHAIN_FILE="./build/cmake/toolchain/linux.toolchain.cmake" ..;\ cmake -DCMAKE_TOOLCHAIN_FILE="./build/cmake/toolchain/linux.toolchain.cmake" ..;\
cd .. cd ..
clean: clean:
rm -rf ../../cmake-shell-linux rm -rf ../../cmake-shell

2
build/global_config.cmake
View File

@ -43,4 +43,4 @@ readability-identifier-naming")
set(CLANG_TIDY_CHECKS "${CLANG_TIDY_CHECKS},-clang-diagnostic-error") set(CLANG_TIDY_CHECKS "${CLANG_TIDY_CHECKS},-clang-diagnostic-error")
set(CLANG_TIDY_CONFIG "-header-filter=\'.*\'") set(CLANG_TIDY_CONFIG "-header-filter=\'.*\'")
set(CLANG_TIDY_CONFIG "${CLANG_TIDY_CONFIG} -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux") set(CLANG_TIDY_CONFIG "${CLANG_TIDY_CONFIG} -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell")

4
hal/CMakeLists.txt
View File

@ -42,7 +42,7 @@ add_custom_target(
${ABSTRACT_SRC_FILES} ${ABSTRACT_SRC_FILES}
${IMPL_SRC_FILES} ${IMPL_SRC_FILES}
${CLANG_TIDY_CONFIG} ${CLANG_TIDY_CONFIG}
-p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell
# -- -I /usr/include/linux/ -X c++ # -- -I /usr/include/linux/ -X c++
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR_IPCSDK}/hal WORKING_DIRECTORY ${CMAKE_SOURCE_DIR_IPCSDK}/hal
) )
@ -51,6 +51,6 @@ add_custom_command(
TARGET ${ABSTRACT_TARGET} TARGET ${ABSTRACT_TARGET}
PRE_BUILD PRE_BUILD
COMMAND make hal_code_check COMMAND make hal_code_check
WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/
) )
endif() endif()

4
middleware/StateMachine/CMakeLists.txt
View File

@ -35,13 +35,13 @@ add_custom_target(
--system-headers=false --system-headers=false
${SRC_FILES} ${SRC_FILES}
${CLANG_TIDY_CONFIG} ${CLANG_TIDY_CONFIG}
-p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell
WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/StateMachine WORKING_DIRECTORY ${MIDDLEWARE_SOURCE_PATH}/StateMachine
) )
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} TARGET ${TARGET_NAME}
PRE_BUILD PRE_BUILD
COMMAND make StateMahince_code_check COMMAND make StateMahince_code_check
WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/
) )
endif() endif()

4
test/utils/Log/CMakeLists.txt
View File

@ -43,13 +43,13 @@ add_custom_target(
${CLANG_TIDY_CONFIG} ${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/gtest.h\"}]'
--line-filter='[{\"name\":\"${EXTERNAL_SOURCE_PATH}/gtest/googletest-release-1.11.0/googletest/include/getest/*.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 WORKING_DIRECTORY ${TEST_SOURCE_PATH}/utils/Log
) )
add_custom_command( add_custom_command(
TARGET ${TARGET_NAME} TARGET ${TARGET_NAME}
PRE_BUILD PRE_BUILD
COMMAND make LogTest_code_check COMMAND make LogTest_code_check
WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/
) )
endif() endif()

4
utils/Log/CMakeLists.txt
View File

@ -38,7 +38,7 @@ add_custom_target(
${IMPL_SRC_FILES} ${IMPL_SRC_FILES}
${ABSTRACT_SRC_FILES} ${ABSTRACT_SRC_FILES}
${CLANG_TIDY_CONFIG} ${CLANG_TIDY_CONFIG}
-p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell
WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/Log WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/Log
) )
add_custom_command( add_custom_command(
@ -46,6 +46,6 @@ add_custom_command(
# TARGET ${ABSTRACT_TARGET} # TARGET ${ABSTRACT_TARGET}
PRE_BUILD PRE_BUILD
COMMAND make Log_code_check COMMAND make Log_code_check
WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/
) )
endif() endif()

4
utils/LogC/CMakeLists.txt
View File

@ -40,7 +40,7 @@ add_custom_target(
${CLANG_TIDY_CONFIG} ${CLANG_TIDY_CONFIG}
--header-filter=.* --header-filter=.*
--system-headers=false --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 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR_IPCSDK}/utils/LogC
) )
@ -49,5 +49,5 @@ add_custom_target(
# TARGET ${ABSTRACT_TARGET} # TARGET ${ABSTRACT_TARGET}
# PRE_BUILD # PRE_BUILD
# COMMAND make log_code_check # COMMAND make log_code_check
# WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ # WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/
# ) # )

4
utils/StatusCode/CMakeLists.txt
View File

@ -31,7 +31,7 @@ add_custom_target(
--system-headers=false --system-headers=false
${SRC_FILES} ${SRC_FILES}
${CLANG_TIDY_CONFIG} ${CLANG_TIDY_CONFIG}
-p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell-linux -p ${CMAKE_SOURCE_DIR_IPCSDK}/cmake-shell
WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/StatusCode WORKING_DIRECTORY ${UTILS_SOURCE_PATH}/StatusCode
) )
add_custom_command( add_custom_command(
@ -39,6 +39,6 @@ add_custom_command(
# TARGET ${ABSTRACT_TARGET} # TARGET ${ABSTRACT_TARGET}
PRE_BUILD PRE_BUILD
COMMAND make StatusCode_code_check COMMAND make StatusCode_code_check
WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell-linux/ WORKING_DIRECTORY ${PROJECT_ROOT_PATH}/cmake-shell/
) )
endif() endif()