From 94054f43378ad5ec6086c90043f421c4d5024e7a Mon Sep 17 00:00:00 2001 From: fancy <258828110.@qq.com> Date: Fri, 17 Nov 2023 22:04:34 -0800 Subject: [PATCH] Improve cmake config for board build. --- CMakeLists.txt | 2 +- application/main/CMakeLists.txt | 3 ++- application/main/src/MainThread.cpp | 3 ++- build/cmake/toolchain/linux.toolchain.cmake | 3 --- build/sdk_config.cmake | 3 +++ 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e0cc50..0f9e229 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ include(build/global_config.cmake) project(app) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) +# set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}) message("platform = ${TARGET_PLATFORM}") diff --git a/application/main/CMakeLists.txt b/application/main/CMakeLists.txt index 418f1b2..a6cb68b 100644 --- a/application/main/CMakeLists.txt +++ b/application/main/CMakeLists.txt @@ -6,6 +6,7 @@ set(LIBRARY_OUTPUT_PATH ${LIBS_OUTPUT_PATH}) set(MAIN_INCLUDE_PATH "${APPLICATION_SOURCE_PATH}/main/src" CACHE STRING INTERNAL FORCE) set(MAIN_INCLUDE_PATH "${MAIN_INCLUDE_PATH};${UTILS_SOURCE_PATH}/StatusCode/include" CACHE STRING INTERNAL FORCE) set(MAIN_INCLUDE_PATH "${MAIN_INCLUDE_PATH};${UTILS_SOURCE_PATH}/Log/include" CACHE STRING INTERNAL FORCE) +set(MAIN_INCLUDE_PATH "${MAIN_INCLUDE_PATH};${HAL_SOURCE_PATH}/include" CACHE STRING INTERNAL FORCE) include_directories(${MAIN_INCLUDE_PATH}) link_directories( @@ -29,7 +30,7 @@ add_library(${TARGET_LIB} STATIC ${MAIN_SRC_FILE_THIS}) set(TARGET_NAME ipc_x86) add_executable(${TARGET_NAME} ${SRC_FILES}) -set(LINK_LIB StatusCode Log pthread dl) +set(LINK_LIB StatusCode Log Hal pthread dl) set(MAIN_LINK_LIB "${LINK_LIB}" CACHE STRING INTERNAL FORCE) target_link_libraries(${TARGET_LIB} ${MAIN_LINK_LIB}) target_link_libraries(${TARGET_NAME} ${TARGET_LIB}) diff --git a/application/main/src/MainThread.cpp b/application/main/src/MainThread.cpp index fdd4d91..417c57a 100644 --- a/application/main/src/MainThread.cpp +++ b/application/main/src/MainThread.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ #include "MainThread.h" -#include "ILog.h" #include "IHal.h" +#include "ILog.h" #include MainThread::MainThread() { mMainThreadRuning = false; } std::shared_ptr &MainThread::GetInstance(std::shared_ptr *impl) @@ -35,6 +35,7 @@ StatusCode MainThread::Init(void) { mMainThreadRuning = true; CreateAllModules(); + IHalInit(); return CreateStatusCode(STATUS_CODE_OK); } StatusCode MainThread::UnInit(void) diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake index 4a5c0e9..9ac90f5 100755 --- a/build/cmake/toolchain/linux.toolchain.cmake +++ b/build/cmake/toolchain/linux.toolchain.cmake @@ -10,9 +10,6 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - - - # Name of the target platform set(CMAKE_SYSTEM_NAME Linux) set(CMAKE_SYSTEM_PROCESSOR arm) diff --git a/build/sdk_config.cmake b/build/sdk_config.cmake index c0ee99c..acde768 100755 --- a/build/sdk_config.cmake +++ b/build/sdk_config.cmake @@ -1,4 +1,7 @@ include(${CMAKE_SOURCE_DIR}${SUBMODULE_PATH_OF_IPC_SDK}/build/global_config.cmake) + +set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + # Gdb debug if(${TARGET_PLATFORM} MATCHES ${DEFINE_LINUX}) message("---------------------------Debug mode.-----------------------")