From d361b7a3a9b69e70b7cd6d8d2a30bc39ed1982f8 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Wed, 13 Mar 2024 15:58:18 +0800 Subject: [PATCH] Improve:make install. --- CMakeLists.txt | 4 +--- application/HunttingCamera/CMakeLists.txt | 5 ++++- application/MissionManager/CMakeLists.txt | 5 ++++- build/cmake/toolchain/linux.toolchain.cmake | 2 ++ build/global_config.cmake | 8 ++++---- hal/CMakeLists.txt | 5 ++++- middleware/AppManager/CMakeLists.txt | 5 ++++- middleware/DeviceManager/CMakeLists.txt | 5 ++++- middleware/McuAskBase/CMakeLists.txt | 5 ++++- middleware/McuManager/CMakeLists.txt | 5 ++++- middleware/MediaManager/CMakeLists.txt | 5 ++++- middleware/StateMachine/CMakeLists.txt | 5 ++++- utils/Config/CMakeLists.txt | 5 ++++- utils/FxHttpServer/CMakeLists.txt | 5 ++++- utils/KeyControl/CMakeLists.txt | 5 ++++- utils/LedControl/CMakeLists.txt | 5 ++++- utils/LinuxApi/CMakeLists.txt | 5 ++++- utils/McuProtocol/CMakeLists.txt | 5 ++++- utils/MediaAdapter/CMakeLists.txt | 5 ++++- utils/ModBusCRC16/CMakeLists.txt | 5 ++++- utils/MultiProcess/CMakeLists.txt | 5 ++++- utils/Servers/CMakeLists.txt | 5 ++++- utils/SharedData/CMakeLists.txt | 5 ++++- utils/StatusCode/CMakeLists.txt | 5 ++++- utils/TcpModule/CMakeLists.txt | 5 ++++- utils/UartDevice/CMakeLists.txt | 5 ++++- utils/WebServer/CMakeLists.txt | 5 ++++- 27 files changed, 103 insertions(+), 31 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd1796dd..dd7836e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,6 +178,4 @@ message("MAIN_SRC_FILE = ${MAIN_SRC_FILE}") message("MAIN_LINK_LIB = ${MAIN_LINK_LIB}") add_subdirectory(test) -# include(build/global_config.cmake) - - +# include(build/global_config.cmake) \ No newline at end of file diff --git a/application/HunttingCamera/CMakeLists.txt b/application/HunttingCamera/CMakeLists.txt index 2a7b81ad..33b10aec 100644 --- a/application/HunttingCamera/CMakeLists.txt +++ b/application/HunttingCamera/CMakeLists.txt @@ -67,4 +67,7 @@ add_custom_command( endif() define_file_name(${TARGET_LIB}) -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES *.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/application/MissionManager/CMakeLists.txt b/application/MissionManager/CMakeLists.txt index 8e98a207..2efa8aa1 100644 --- a/application/MissionManager/CMakeLists.txt +++ b/application/MissionManager/CMakeLists.txt @@ -61,4 +61,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/build/cmake/toolchain/linux.toolchain.cmake b/build/cmake/toolchain/linux.toolchain.cmake index 597aef7b..7551d779 100755 --- a/build/cmake/toolchain/linux.toolchain.cmake +++ b/build/cmake/toolchain/linux.toolchain.cmake @@ -32,6 +32,8 @@ set(SUBMODULE_PATH_OF_IPC_SDK "") set(PLATFORM_PATH "${CMAKE_CURRENT_SOURCE_DIR}") set(TEST_COVERAGE "true") add_definitions(-DPLATFORM_PATH=\"${PLATFORM_PATH}\") +set(PROJECT_OUTPUT_FOLDER "output_files") +set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_OUTPUT_FOLDER}") # ------------ build curl + openssl ------------ # set(CURL_OPENSSL_LIB_SHARED_ENABLE "false") diff --git a/build/global_config.cmake b/build/global_config.cmake index 2cbb73ab..1390e4a2 100755 --- a/build/global_config.cmake +++ b/build/global_config.cmake @@ -1,10 +1,10 @@ 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(EXEC_OUTPUT_PATH "${PLATFORM_PATH}/output_files/bin") -set(LIBS_OUTPUT_PATH "${PLATFORM_PATH}/output_files/libs") -set(EXTERNAL_LIBS_OUTPUT_PATH "${PLATFORM_PATH}/output_files/libs/external") -set(TEST_OUTPUT_PATH "${PLATFORM_PATH}/output_files/test") +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") +set(TEST_OUTPUT_PATH "${PLATFORM_PATH}/${PROJECT_OUTPUT_FOLDER}/test") set(PROJECT_ROOT_PATH "${PLATFORM_PATH}") set(APPLICATION_SOURCE_PATH "${CMAKE_SOURCE_DIR_IPCSDK}/application") diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index 72d47da7..5169b8a2 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -58,4 +58,7 @@ add_custom_command( endif() define_file_name(${IMPL_TARGET}) -define_file_name(${ABSTRACT_TARGET}) \ No newline at end of file +define_file_name(${ABSTRACT_TARGET}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/middleware/AppManager/CMakeLists.txt b/middleware/AppManager/CMakeLists.txt index d7ed36d3..aa933a30 100644 --- a/middleware/AppManager/CMakeLists.txt +++ b/middleware/AppManager/CMakeLists.txt @@ -55,4 +55,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/middleware/DeviceManager/CMakeLists.txt b/middleware/DeviceManager/CMakeLists.txt index 05ccd3af..37344b31 100644 --- a/middleware/DeviceManager/CMakeLists.txt +++ b/middleware/DeviceManager/CMakeLists.txt @@ -51,4 +51,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/middleware/McuAskBase/CMakeLists.txt b/middleware/McuAskBase/CMakeLists.txt index 4e98dfd0..1b0e51a3 100644 --- a/middleware/McuAskBase/CMakeLists.txt +++ b/middleware/McuAskBase/CMakeLists.txt @@ -66,4 +66,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/middleware/McuManager/CMakeLists.txt b/middleware/McuManager/CMakeLists.txt index b0e1764b..adcca1a2 100644 --- a/middleware/McuManager/CMakeLists.txt +++ b/middleware/McuManager/CMakeLists.txt @@ -63,4 +63,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/middleware/MediaManager/CMakeLists.txt b/middleware/MediaManager/CMakeLists.txt index b74a5789..a4565b22 100644 --- a/middleware/MediaManager/CMakeLists.txt +++ b/middleware/MediaManager/CMakeLists.txt @@ -63,4 +63,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/middleware/StateMachine/CMakeLists.txt b/middleware/StateMachine/CMakeLists.txt index 066cdf6d..04e67cdb 100644 --- a/middleware/StateMachine/CMakeLists.txt +++ b/middleware/StateMachine/CMakeLists.txt @@ -58,4 +58,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/Config/CMakeLists.txt b/utils/Config/CMakeLists.txt index 26f38017..0d04847f 100644 --- a/utils/Config/CMakeLists.txt +++ b/utils/Config/CMakeLists.txt @@ -94,4 +94,7 @@ function(config_owner target) endfunction() define_file_name(${TARGET_NAME}) -config_owner(${TARGET_NAME}) \ No newline at end of file +config_owner(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/FxHttpServer/CMakeLists.txt b/utils/FxHttpServer/CMakeLists.txt index 6560c21f..8fba0ba7 100644 --- a/utils/FxHttpServer/CMakeLists.txt +++ b/utils/FxHttpServer/CMakeLists.txt @@ -62,4 +62,7 @@ if(EPOLL) target_compile_definitions(${TARGET_NAME} PRIVATE EPOLL) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/KeyControl/CMakeLists.txt b/utils/KeyControl/CMakeLists.txt index b3b99bb7..102e6a1d 100644 --- a/utils/KeyControl/CMakeLists.txt +++ b/utils/KeyControl/CMakeLists.txt @@ -51,4 +51,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/LedControl/CMakeLists.txt b/utils/LedControl/CMakeLists.txt index 996180de..6f212f65 100644 --- a/utils/LedControl/CMakeLists.txt +++ b/utils/LedControl/CMakeLists.txt @@ -51,4 +51,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/LinuxApi/CMakeLists.txt b/utils/LinuxApi/CMakeLists.txt index 02198248..ea8af247 100644 --- a/utils/LinuxApi/CMakeLists.txt +++ b/utils/LinuxApi/CMakeLists.txt @@ -48,4 +48,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/McuProtocol/CMakeLists.txt b/utils/McuProtocol/CMakeLists.txt index 1f69dda0..0b37a80a 100644 --- a/utils/McuProtocol/CMakeLists.txt +++ b/utils/McuProtocol/CMakeLists.txt @@ -51,4 +51,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/MediaAdapter/CMakeLists.txt b/utils/MediaAdapter/CMakeLists.txt index 5db3d4c3..48c919bd 100644 --- a/utils/MediaAdapter/CMakeLists.txt +++ b/utils/MediaAdapter/CMakeLists.txt @@ -51,4 +51,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/ModBusCRC16/CMakeLists.txt b/utils/ModBusCRC16/CMakeLists.txt index 502c743a..a60d4dc4 100644 --- a/utils/ModBusCRC16/CMakeLists.txt +++ b/utils/ModBusCRC16/CMakeLists.txt @@ -40,4 +40,7 @@ add_custom_command( WORKING_DIRECTORY ${PLATFORM_PATH}/cmake-shell/ ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/MultiProcess/CMakeLists.txt b/utils/MultiProcess/CMakeLists.txt index 2aa363d8..59ff909d 100644 --- a/utils/MultiProcess/CMakeLists.txt +++ b/utils/MultiProcess/CMakeLists.txt @@ -49,4 +49,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/Servers/CMakeLists.txt b/utils/Servers/CMakeLists.txt index 7c7fa752..1e356c4c 100755 --- a/utils/Servers/CMakeLists.txt +++ b/utils/Servers/CMakeLists.txt @@ -137,4 +137,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/SharedData/CMakeLists.txt b/utils/SharedData/CMakeLists.txt index f531fc39..f80f2eff 100644 --- a/utils/SharedData/CMakeLists.txt +++ b/utils/SharedData/CMakeLists.txt @@ -50,4 +50,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/StatusCode/CMakeLists.txt b/utils/StatusCode/CMakeLists.txt index 2fe39aea..3f2d415e 100644 --- a/utils/StatusCode/CMakeLists.txt +++ b/utils/StatusCode/CMakeLists.txt @@ -49,4 +49,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/TcpModule/CMakeLists.txt b/utils/TcpModule/CMakeLists.txt index 6b3590da..2b6dd884 100644 --- a/utils/TcpModule/CMakeLists.txt +++ b/utils/TcpModule/CMakeLists.txt @@ -48,4 +48,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/UartDevice/CMakeLists.txt b/utils/UartDevice/CMakeLists.txt index ca388ea0..eafbfeba 100644 --- a/utils/UartDevice/CMakeLists.txt +++ b/utils/UartDevice/CMakeLists.txt @@ -48,4 +48,7 @@ add_custom_command( ) endif() -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file diff --git a/utils/WebServer/CMakeLists.txt b/utils/WebServer/CMakeLists.txt index 1490c8ef..7b0663be 100644 --- a/utils/WebServer/CMakeLists.txt +++ b/utils/WebServer/CMakeLists.txt @@ -107,4 +107,7 @@ add_custom_target( WORKING_DIRECTORY ${EXTERNAL_SOURCE_PATH}/goahead-5.2.0/GoAhead ) -define_file_name(${TARGET_NAME}) \ No newline at end of file +define_file_name(${TARGET_NAME}) + +file(GLOB_RECURSE INSTALL_HEADER_FILES include/*.h) +install(FILES ${INSTALL_HEADER_FILES} DESTINATION include) \ No newline at end of file