From ce3da311a632bb41197348c68fc64e4263003716 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Thu, 15 Feb 2024 19:39:13 -0800 Subject: [PATCH] Fixed:Resolve CMakeLists warning. --- application/MissionManager/CMakeLists.txt | 3 +-- application/main/CMakeLists.txt | 3 +-- external/lvgl_simulator/CMakeLists.txt | 3 +-- external/sqlite3/sqlite-3430000/CMakeLists.txt | 3 +-- hal/CMakeLists.txt | 3 +-- middleware/DeviceManager/CMakeLists.txt | 3 +-- middleware/GuiEngine/CMakeLists.txt | 3 +-- middleware/IpcConfig/CMakeLists.txt | 3 +-- middleware/McuAskBase/CMakeLists.txt | 3 +-- middleware/McuManager/CMakeLists.txt | 3 +-- middleware/StateMachine/CMakeLists.txt | 3 +-- test/all/CMakeLists.txt | 6 ++---- test/hal/CMakeLists.txt | 6 ++---- test/hal/tool/CMakeLists.txt | 6 +++--- test/hal/tool/include/HalTestTool.h | 14 +++++++++++++- test/middleware/DeviceManager/CMakeLists.txt | 3 +-- test/middleware/IpcConfig/CMakeLists.txt | 6 ++---- test/middleware/McuAskBase/tool/CMakeLists.txt | 3 +-- test/middleware/McuManager/CMakeLists.txt | 3 +-- test/middleware/McuManager/tool/CMakeLists.txt | 3 +-- test/utils/Config/CMakeLists.txt | 6 ++---- test/utils/LinuxApiMock/CMakeLists.txt | 3 +-- test/utils/Log/CMakeLists.txt | 6 ++---- test/utils/McuProtocol/tool/CMakeLists.txt | 3 +-- test/utils/SharedData/CMakeLists.txt | 6 ++---- test/utils/UartDevice/CMakeLists.txt | 3 +-- test/utils/UartDevice/tool/CMakeLists.txt | 3 +-- test/utils/WebServer/CMakeLists.txt | 6 ++---- utils/Config/CMakeLists.txt | 3 +-- utils/KeyControl/CMakeLists.txt | 3 +-- utils/LedControl/CMakeLists.txt | 3 +-- utils/LinuxApi/CMakeLists.txt | 3 +-- utils/Log/CMakeLists.txt | 3 +-- utils/McuProtocol/CMakeLists.txt | 3 +-- utils/ModBusCRC16/CMakeLists.txt | 3 +-- utils/MultiProcess/CMakeLists.txt | 3 +-- utils/SharedData/CMakeLists.txt | 3 +-- utils/StatusCode/CMakeLists.txt | 3 +-- utils/UartDevice/CMakeLists.txt | 3 +-- utils/WebServer/CMakeLists.txt | 3 +-- 40 files changed, 61 insertions(+), 94 deletions(-) diff --git a/application/MissionManager/CMakeLists.txt b/application/MissionManager/CMakeLists.txt index 6708690..e4b9251 100644 --- a/application/MissionManager/CMakeLists.txt +++ b/application/MissionManager/CMakeLists.txt @@ -15,8 +15,7 @@ include_directories( #link_directories( #) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/application/main/CMakeLists.txt b/application/main/CMakeLists.txt index a6cb68b..b27a2d5 100644 --- a/application/main/CMakeLists.txt +++ b/application/main/CMakeLists.txt @@ -14,8 +14,7 @@ link_directories( ${HAL_SOURCE_PATH}/include ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./ SRC_FILES) # aux_source_directory(./src SRC_FILES) diff --git a/external/lvgl_simulator/CMakeLists.txt b/external/lvgl_simulator/CMakeLists.txt index ff5247a..a1c4d19 100644 --- a/external/lvgl_simulator/CMakeLists.txt +++ b/external/lvgl_simulator/CMakeLists.txt @@ -27,8 +27,7 @@ set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wshadow -Wundef -Wmaybe-uninitialized -Wmiss add_definitions(-DSIMULATOR=1) add_definitions(-DLV_BUILD_TEST=0) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + file(GLOB_RECURSE SRC_FILES_CPP *.cpp) file(GLOB_RECURSE SRC_FILES *.c) diff --git a/external/sqlite3/sqlite-3430000/CMakeLists.txt b/external/sqlite3/sqlite-3430000/CMakeLists.txt index c18886b..1ddcb11 100644 --- a/external/sqlite3/sqlite-3430000/CMakeLists.txt +++ b/external/sqlite3/sqlite-3430000/CMakeLists.txt @@ -9,8 +9,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + file(GLOB_RECURSE SRC_FILES ./sqlite3.c) diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index 0b0e626..116432d 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -15,8 +15,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/curl/curl-8.1.2/build/lib # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./abstract ABSTRACT_SRC_FILES) aux_source_directory(./src IMPL_SRC_FILES) diff --git a/middleware/DeviceManager/CMakeLists.txt b/middleware/DeviceManager/CMakeLists.txt index 2f0da22..58469da 100644 --- a/middleware/DeviceManager/CMakeLists.txt +++ b/middleware/DeviceManager/CMakeLists.txt @@ -14,8 +14,7 @@ include_directories( #link_directories( #) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/middleware/GuiEngine/CMakeLists.txt b/middleware/GuiEngine/CMakeLists.txt index f4e7b46..adde675 100755 --- a/middleware/GuiEngine/CMakeLists.txt +++ b/middleware/GuiEngine/CMakeLists.txt @@ -23,8 +23,7 @@ See example: /sifarsdk/build/cmake/toolchain/linux.toolchain.cmake: Such as: set(GUI_IMAGES_PATHd \"A:./\")") endif() -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + file(GLOB_RECURSE ABSTRACT_FILE abstract/*.cpp abstract/*.c) diff --git a/middleware/IpcConfig/CMakeLists.txt b/middleware/IpcConfig/CMakeLists.txt index 32d2e74..c58f9c5 100644 --- a/middleware/IpcConfig/CMakeLists.txt +++ b/middleware/IpcConfig/CMakeLists.txt @@ -14,8 +14,7 @@ include_directories( #link_directories( #) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + if (DEFINED IPC_CONFIG_FILE_PATH) add_definitions(-DIPC_CONFIG_FILE_PATH=\"${IPC_CONFIG_FILE_PATH}\") else() diff --git a/middleware/McuAskBase/CMakeLists.txt b/middleware/McuAskBase/CMakeLists.txt index e6787b4..5082baa 100644 --- a/middleware/McuAskBase/CMakeLists.txt +++ b/middleware/McuAskBase/CMakeLists.txt @@ -16,8 +16,7 @@ include_directories( #link_directories( #) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + if (DEFINED MCU_UART_DEVICE) add_definitions(-DMCU_UART_DEVICE=\"${MCU_UART_DEVICE}\") diff --git a/middleware/McuManager/CMakeLists.txt b/middleware/McuManager/CMakeLists.txt index 2059e09..3887c22 100644 --- a/middleware/McuManager/CMakeLists.txt +++ b/middleware/McuManager/CMakeLists.txt @@ -16,8 +16,7 @@ include_directories( #link_directories( #) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + if (DEFINED MCU_UART_DEVICE) add_definitions(-DMCU_UART_DEVICE=\"${MCU_UART_DEVICE}\") diff --git a/middleware/StateMachine/CMakeLists.txt b/middleware/StateMachine/CMakeLists.txt index e84be30..9736186 100644 --- a/middleware/StateMachine/CMakeLists.txt +++ b/middleware/StateMachine/CMakeLists.txt @@ -15,8 +15,7 @@ include_directories( #link_directories( #) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) aux_source_directory(./src/OpenHarmony SRC_FILES_OPENHARMONY) diff --git a/test/all/CMakeLists.txt b/test/all/CMakeLists.txt index 83d53c4..ea317d8 100644 --- a/test/all/CMakeLists.txt +++ b/test/all/CMakeLists.txt @@ -18,11 +18,9 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + + aux_source_directory(. SRC_FILES) aux_source_directory(${TEST_SOURCE_PATH}/middleware/IpcConfig/src SRC_FILES) diff --git a/test/hal/CMakeLists.txt b/test/hal/CMakeLists.txt index 4e2f611..2572a4e 100644 --- a/test/hal/CMakeLists.txt +++ b/test/hal/CMakeLists.txt @@ -14,11 +14,9 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + + aux_source_directory(. SRC_FILES) aux_source_directory(./src SRC_FILES) diff --git a/test/hal/tool/CMakeLists.txt b/test/hal/tool/CMakeLists.txt index 7cea352..14fb1f6 100644 --- a/test/hal/tool/CMakeLists.txt +++ b/test/hal/tool/CMakeLists.txt @@ -8,7 +8,8 @@ include_directories( ${UTILS_SOURCE_PATH}/StatusCode/include ${UTILS_SOURCE_PATH}/Log/include # ${UTILS_SOURCE_PATH}/McuProtocol/include - # ${MIDDLEWARE_SOURCE_PATH}/Hal/src + ${HAL_SOURCE_PATH}/src + # /home/xiaojiazhu/project/rkipc/battery/ipc-rk1106/ipc-sdk/hal/src/HalCpp.h # ${TEST_SOURCE_PATH}/utils/LinuxApiMock/include # ${TEST_SOURCE_PATH}/utils/McuProtocol/tool/include ) @@ -16,8 +17,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src TEST_TOOL_SRC_FILES) set(TEST_TOOL_TARGET HalTestTool) diff --git a/test/hal/tool/include/HalTestTool.h b/test/hal/tool/include/HalTestTool.h index f80e05a..841cd05 100644 --- a/test/hal/tool/include/HalTestTool.h +++ b/test/hal/tool/include/HalTestTool.h @@ -14,5 +14,17 @@ */ #ifndef HAL_TEST_TOOL_H #define HAL_TEST_TOOL_H - +#include "HalCpp.h" +class HalCppTest : public HalCpp +{ +public: + HalCppTest() = default; + virtual ~HalCppTest() = default; +}; +class HalTestTool +{ +public: + HalTestTool() = default; + virtual ~HalTestTool() = default; +}; #endif \ No newline at end of file diff --git a/test/middleware/DeviceManager/CMakeLists.txt b/test/middleware/DeviceManager/CMakeLists.txt index e023fce..a2d97ec 100644 --- a/test/middleware/DeviceManager/CMakeLists.txt +++ b/test/middleware/DeviceManager/CMakeLists.txt @@ -26,8 +26,7 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(. SRC_FILES_MAIN) aux_source_directory(./src SRC_FILES) diff --git a/test/middleware/IpcConfig/CMakeLists.txt b/test/middleware/IpcConfig/CMakeLists.txt index 100f6f9..f8f87dd 100644 --- a/test/middleware/IpcConfig/CMakeLists.txt +++ b/test/middleware/IpcConfig/CMakeLists.txt @@ -18,11 +18,9 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + + aux_source_directory(. SRC_FILES_MAIN) aux_source_directory(./src SRC_FILES) diff --git a/test/middleware/McuAskBase/tool/CMakeLists.txt b/test/middleware/McuAskBase/tool/CMakeLists.txt index b18d013..7b9ca7b 100644 --- a/test/middleware/McuAskBase/tool/CMakeLists.txt +++ b/test/middleware/McuAskBase/tool/CMakeLists.txt @@ -20,8 +20,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src TEST_TOOL_SRC_FILES) set(TEST_TOOL_TARGET McuAskBaseTestTool) diff --git a/test/middleware/McuManager/CMakeLists.txt b/test/middleware/McuManager/CMakeLists.txt index c1c7dc5..e962263 100644 --- a/test/middleware/McuManager/CMakeLists.txt +++ b/test/middleware/McuManager/CMakeLists.txt @@ -26,8 +26,7 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + if (DEFINED MCU_UART_DEVICE) add_definitions(-DMCU_UART_DEVICE=\"${MCU_UART_DEVICE}\") diff --git a/test/middleware/McuManager/tool/CMakeLists.txt b/test/middleware/McuManager/tool/CMakeLists.txt index 62f3294..f710903 100644 --- a/test/middleware/McuManager/tool/CMakeLists.txt +++ b/test/middleware/McuManager/tool/CMakeLists.txt @@ -16,8 +16,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src TEST_TOOL_SRC_FILES) set(TEST_TOOL_TARGET McuManagerTestTool) diff --git a/test/utils/Config/CMakeLists.txt b/test/utils/Config/CMakeLists.txt index d0203ef..30499ab 100644 --- a/test/utils/Config/CMakeLists.txt +++ b/test/utils/Config/CMakeLists.txt @@ -18,11 +18,9 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + + aux_source_directory(. SRC_FILES) aux_source_directory(./src SRC_FILES) diff --git a/test/utils/LinuxApiMock/CMakeLists.txt b/test/utils/LinuxApiMock/CMakeLists.txt index 8426e18..66beab9 100644 --- a/test/utils/LinuxApiMock/CMakeLists.txt +++ b/test/utils/LinuxApiMock/CMakeLists.txt @@ -13,8 +13,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/test/utils/Log/CMakeLists.txt b/test/utils/Log/CMakeLists.txt index 53a229d..dd8977b 100644 --- a/test/utils/Log/CMakeLists.txt +++ b/test/utils/Log/CMakeLists.txt @@ -16,11 +16,9 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + + aux_source_directory(. SRC_FILES) aux_source_directory(./src SRC_FILES) diff --git a/test/utils/McuProtocol/tool/CMakeLists.txt b/test/utils/McuProtocol/tool/CMakeLists.txt index dd22d99..eba949a 100644 --- a/test/utils/McuProtocol/tool/CMakeLists.txt +++ b/test/utils/McuProtocol/tool/CMakeLists.txt @@ -19,8 +19,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src TEST_TOOL_SRC_FILES) set(TEST_TOOL_TARGET McuProtocolTestTool) diff --git a/test/utils/SharedData/CMakeLists.txt b/test/utils/SharedData/CMakeLists.txt index 4b7782b..91a6fa5 100644 --- a/test/utils/SharedData/CMakeLists.txt +++ b/test/utils/SharedData/CMakeLists.txt @@ -15,11 +15,9 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + + aux_source_directory(. SRC_FILES) aux_source_directory(./src SRC_FILES) diff --git a/test/utils/UartDevice/CMakeLists.txt b/test/utils/UartDevice/CMakeLists.txt index bc452e5..af1073e 100644 --- a/test/utils/UartDevice/CMakeLists.txt +++ b/test/utils/UartDevice/CMakeLists.txt @@ -17,8 +17,7 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(. SRC_FILES) aux_source_directory(./src SRC_FILES) diff --git a/test/utils/UartDevice/tool/CMakeLists.txt b/test/utils/UartDevice/tool/CMakeLists.txt index b4b7e1b..8ec4c7c 100644 --- a/test/utils/UartDevice/tool/CMakeLists.txt +++ b/test/utils/UartDevice/tool/CMakeLists.txt @@ -13,8 +13,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src TEST_TOOL_SRC_FILES) set(TEST_TOOL_TARGET UartDeviceTestTool) diff --git a/test/utils/WebServer/CMakeLists.txt b/test/utils/WebServer/CMakeLists.txt index b065344..6d1e1d3 100644 --- a/test/utils/WebServer/CMakeLists.txt +++ b/test/utils/WebServer/CMakeLists.txt @@ -15,11 +15,9 @@ link_directories( ${EXTERNAL_LIBS_OUTPUT_PATH} ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + + aux_source_directory(. SRC_FILES) aux_source_directory(./src SRC_FILES) diff --git a/utils/Config/CMakeLists.txt b/utils/Config/CMakeLists.txt index ba49d3b..fc6444e 100644 --- a/utils/Config/CMakeLists.txt +++ b/utils/Config/CMakeLists.txt @@ -14,8 +14,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/KeyControl/CMakeLists.txt b/utils/KeyControl/CMakeLists.txt index 414fdf8..63486d7 100644 --- a/utils/KeyControl/CMakeLists.txt +++ b/utils/KeyControl/CMakeLists.txt @@ -14,8 +14,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/LedControl/CMakeLists.txt b/utils/LedControl/CMakeLists.txt index 99dd892..2a024dd 100644 --- a/utils/LedControl/CMakeLists.txt +++ b/utils/LedControl/CMakeLists.txt @@ -14,8 +14,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/LinuxApi/CMakeLists.txt b/utils/LinuxApi/CMakeLists.txt index 6891146..3e68c0a 100644 --- a/utils/LinuxApi/CMakeLists.txt +++ b/utils/LinuxApi/CMakeLists.txt @@ -11,8 +11,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/Log/CMakeLists.txt b/utils/Log/CMakeLists.txt index 0216cae..68f9b9b 100644 --- a/utils/Log/CMakeLists.txt +++ b/utils/Log/CMakeLists.txt @@ -14,8 +14,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/curl/curl-8.1.2/build/lib # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./abstract ABSTRACT_SRC_FILES) aux_source_directory(./src IMPL_SRC_FILES) diff --git a/utils/McuProtocol/CMakeLists.txt b/utils/McuProtocol/CMakeLists.txt index 95132a9..85217bb 100644 --- a/utils/McuProtocol/CMakeLists.txt +++ b/utils/McuProtocol/CMakeLists.txt @@ -14,8 +14,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/ModBusCRC16/CMakeLists.txt b/utils/ModBusCRC16/CMakeLists.txt index fccf46b..3a14642 100644 --- a/utils/ModBusCRC16/CMakeLists.txt +++ b/utils/ModBusCRC16/CMakeLists.txt @@ -13,8 +13,7 @@ include_directories( #link_directories( #) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/MultiProcess/CMakeLists.txt b/utils/MultiProcess/CMakeLists.txt index bc3d290..4b2b60a 100644 --- a/utils/MultiProcess/CMakeLists.txt +++ b/utils/MultiProcess/CMakeLists.txt @@ -12,8 +12,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/SharedData/CMakeLists.txt b/utils/SharedData/CMakeLists.txt index 50a05d6..ea18931 100644 --- a/utils/SharedData/CMakeLists.txt +++ b/utils/SharedData/CMakeLists.txt @@ -13,8 +13,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/StatusCode/CMakeLists.txt b/utils/StatusCode/CMakeLists.txt index e7185d8..8cf4c19 100644 --- a/utils/StatusCode/CMakeLists.txt +++ b/utils/StatusCode/CMakeLists.txt @@ -13,8 +13,7 @@ include_directories( #link_directories( #) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/UartDevice/CMakeLists.txt b/utils/UartDevice/CMakeLists.txt index 66bbeff..0b16db3 100644 --- a/utils/UartDevice/CMakeLists.txt +++ b/utils/UartDevice/CMakeLists.txt @@ -13,8 +13,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + aux_source_directory(./src SRC_FILES) diff --git a/utils/WebServer/CMakeLists.txt b/utils/WebServer/CMakeLists.txt index 68ecbd7..34998d0 100644 --- a/utils/WebServer/CMakeLists.txt +++ b/utils/WebServer/CMakeLists.txt @@ -15,8 +15,7 @@ include_directories( # ${EXTERNAL_SOURCE_PATH}/libconfig/libconfig-1.7.3/lib/.libs # ) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + if (NOT DEFINED GOAHEAD_DOCUMENTS_PATH) set(GOAHEAD_DOCUMENTS_PATH "web")