From 13cb172160f5517e8ae80e069a5fb77ccb7f211f Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Tue, 2 Apr 2024 10:45:45 +0800 Subject: [PATCH] Improve:cmake build. --- CMakeLists.txt | 3 +++ build/global_config.cmake | 4 ++-- build/sdk_config.cmake | 2 +- external/httpserver.h-master/src/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a2678b01..2f54d44e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,7 @@ cmake_minimum_required(VERSION 3.5.1) + +unset(CLANG_TIDY_EXE CACHE) +set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_CURRENT_SOURCE_DIR}" CACHE STRING INTERNAL) include(build/global_config.cmake) project(fancycode) diff --git a/build/global_config.cmake b/build/global_config.cmake index 1390e4a2..1dbbefc4 100755 --- a/build/global_config.cmake +++ b/build/global_config.cmake @@ -1,6 +1,6 @@ set(DEFINE_LINUX "linux") -set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR}") -set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR_IPCSDK}${SUBMODULE_PATH_OF_IPC_SDK}") +# set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR}") +# set(CMAKE_SOURCE_DIR_IPCSDK "${CMAKE_SOURCE_DIR_IPCSDK}${SUBMODULE_PATH_OF_IPC_SDK}") set(EXEC_OUTPUT_PATH "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/bin") set(LIBS_OUTPUT_PATH "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/libs") set(EXTERNAL_LIBS_OUTPUT_PATH "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/libs/external") diff --git a/build/sdk_config.cmake b/build/sdk_config.cmake index acde7684..16db45b8 100755 --- a/build/sdk_config.cmake +++ b/build/sdk_config.cmake @@ -1,4 +1,4 @@ -include(${CMAKE_SOURCE_DIR}${SUBMODULE_PATH_OF_IPC_SDK}/build/global_config.cmake) +include(${CMAKE_SOURCE_DIR_IPCSDK}/build/global_config.cmake) set(CMAKE_EXPORT_COMPILE_COMMANDS ON) diff --git a/external/httpserver.h-master/src/CMakeLists.txt b/external/httpserver.h-master/src/CMakeLists.txt index 07b92406..382c7176 100644 --- a/external/httpserver.h-master/src/CMakeLists.txt +++ b/external/httpserver.h-master/src/CMakeLists.txt @@ -67,7 +67,7 @@ if(EPOLL) target_compile_definitions(httpsrv PRIVATE EPOLL) endif() -message("${PLATFORM_PATH}/cmake-shell/external${SUBMODULE_PATH_OF_IPC_SDK}/httpserver.h-master/src/libhttpsrv.a") +message("${PLATFORM_PATH}/cmake-shell${SUBMODULE_PATH_OF_IPC_SDK}/httpserver.h-master/src/libhttpsrv.a") add_custom_command( TARGET httpsrv POST_BUILD