6 Commits
Author SHA1 Message Date
7iwind ccde2f73e9 Merge pull request 'fix: 修正缺失构建平台的错误' (#35) from feature/route into main
CI / host (push) Successful in 7s
CI / cortex-m (push) Successful in 7s
Release / release (push) Successful in 16s
Reviewed-on: #35
2026-07-27 00:30:21 +08:00
7iwind 3b44bd97f7 fix: 修正缺失构建平台的错误
CI / host (pull_request) Successful in 4s
CI / cortex-m (pull_request) Successful in 6s
2026-07-27 00:29:35 +08:00
7iwind c5fea61784 Merge pull request 'fix: 修正缺失构建平台的错误' (#34) from feature/route into main
CI / host (push) Successful in 18s
CI / cortex-m (push) Successful in 3s
Release / release (push) Successful in 9s
Reviewed-on: #34
2026-07-27 00:23:31 +08:00
7iwind 07c4aa316a fix: 修正缺失构建平台的错误
CI / host (pull_request) Successful in 4s
CI / cortex-m (pull_request) Successful in 3s
2026-07-27 00:20:33 +08:00
7iwind 5d1ef621db Merge pull request 'fix: 修正缺失构建平台的错误' (#33) from feature/route into main
CI / host (push) Successful in 2s
CI / cortex-m (push) Successful in 3s
Release / release (push) Successful in 9s
Reviewed-on: #33
2026-07-27 00:15:18 +08:00
7iwind 8fe1b36cdc fix: 修正缺失构建平台的错误
CI / host (pull_request) Successful in 3s
CI / cortex-m (pull_request) Successful in 4s
2026-07-27 00:15:00 +08:00
3 changed files with 46 additions and 5 deletions
+1
View File
@@ -111,6 +111,7 @@ jobs:
cmake -S . -B "build-$name" \ cmake -S . -B "build-$name" \
-DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF \ -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF \
-DCMAKE_C_COMPILER=arm-none-eabi-gcc \ -DCMAKE_C_COMPILER=arm-none-eabi-gcc \
-DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY \
-DCMAKE_C_FLAGS="$flags" -DCMAKE_C_FLAGS="$flags"
cmake --build "build-$name" cmake --build "build-$name"
cmake --install "build-$name" --prefix "dist/datarouter-$name" cmake --install "build-$name" --prefix "dist/datarouter-$name"
+43 -3
View File
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.10) cmake_minimum_required(VERSION 3.10)
project(DataRouter C) project(DataRouter VERSION 1.1.0 LANGUAGES C)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
@@ -56,7 +56,10 @@ endif()
# ── 常规库构建 ──────────────────────────────────────────────── # ── 常规库构建 ────────────────────────────────────────────────
add_library(DataRouter STATIC datarouter.c) add_library(DataRouter STATIC datarouter.c)
target_include_directories(DataRouter PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_include_directories(DataRouter PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
if(BUILD_EXAMPLES OR NOT DEFINED BUILD_EXAMPLES) if(BUILD_EXAMPLES OR NOT DEFINED BUILD_EXAMPLES)
add_executable(example example.c) add_executable(example example.c)
@@ -73,10 +76,47 @@ endif()
# ── 安装规则(用于打包发布) ───────────────────────────── # ── 安装规则(用于打包发布) ─────────────────────────────
include(GNUInstallDirs) include(GNUInstallDirs)
install(TARGETS DataRouter ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) include(CMakePackageConfigHelpers)
set(DataRouter_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/DataRouter")
install(TARGETS DataRouter
EXPORT DataRouterTargets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
install(FILES install(FILES
${CMAKE_CURRENT_SOURCE_DIR}/datarouter.h ${CMAKE_CURRENT_SOURCE_DIR}/datarouter.h
${CMAKE_CURRENT_SOURCE_DIR}/datarouter_config.h ${CMAKE_CURRENT_SOURCE_DIR}/datarouter_config.h
${CMAKE_CURRENT_SOURCE_DIR}/datarouter_config_template.h ${CMAKE_CURRENT_SOURCE_DIR}/datarouter_config_template.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
) )
# ── CMake 包配置文件(find_package(DataRouter) 用) ────
set(PACKAGE_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR})
set(PACKAGE_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
configure_package_config_file(
${CMAKE_CURRENT_SOURCE_DIR}/cmake/DataRouterConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/DataRouterConfig.cmake
INSTALL_DESTINATION ${DataRouter_INSTALL_CMAKEDIR}
PATH_VARS PACKAGE_INCLUDE_INSTALL_DIR PACKAGE_LIB_INSTALL_DIR
)
write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/DataRouterConfigVersion.cmake
VERSION ${PROJECT_VERSION}
COMPATIBILITY AnyNewerVersion
)
install(EXPORT DataRouterTargets
FILE DataRouterTargets.cmake
DESTINATION ${DataRouter_INSTALL_CMAKEDIR}
)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/DataRouterConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/DataRouterConfigVersion.cmake
DESTINATION ${DataRouter_INSTALL_CMAKEDIR}
)
+2 -2
View File
@@ -1,7 +1,7 @@
@PACKAGE_INIT@ @PACKAGE_INIT@
set_and_check(DataRouter_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@") set(DataRouter_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
set_and_check(DataRouter_LIBRARY_DIR "@PACKAGE_LIB_INSTALL_DIR@") set(DataRouter_LIBRARY_DIR "@PACKAGE_LIB_INSTALL_DIR@")
include("${CMAKE_CURRENT_LIST_DIR}/DataRouterTargets.cmake" OPTIONAL) include("${CMAKE_CURRENT_LIST_DIR}/DataRouterTargets.cmake" OPTIONAL)