From 874e7cd46fa26adc93a290f903e1a061edfe287a Mon Sep 17 00:00:00 2001 From: zhaohe Date: Mon, 27 Feb 2023 17:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84cmake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 5 ++++- dep/zlinuxcomponents | 2 +- src/main.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01bcf4f..4c88565 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,10 @@ include(dep/asio1.12.2/module.cmake) include(dep/websocketpp/module.cmake) include(dep/zservice_container/module.cmake) include(dep/zwebservice/module.cmake) -include(dep/zlinuxcomponents/module.cmake) +include(dep/zlinuxcomponents/alsaplayer/module.cmake) +include(dep/zlinuxcomponents/rootfs_auto_update/module.cmake) +include(dep/zlinuxcomponents/mycroft_precise/module.cmake) +include(dep/zlinuxcomponents/audio/module.cmake) # 设置当前工程依赖的头文件路径和链接的库文件 set(DEP_INCLUDE ${DEP_INCLUDE} ./dep/) diff --git a/dep/zlinuxcomponents b/dep/zlinuxcomponents index 5f848da..f2363bc 160000 --- a/dep/zlinuxcomponents +++ b/dep/zlinuxcomponents @@ -1 +1 @@ -Subproject commit 5f848da0b558c87b39251eedfe27b45eadaaa1c3 +Subproject commit f2363bcf3040be73209257711fda42798883005c diff --git a/src/main.cpp b/src/main.cpp index fbea4f7..0d29044 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,7 @@ #include "spdlog/spdlog.h" #include "version.hpp" -#include "zlinuxcomponents/rootfs_auto_update.hpp" +#include "zlinuxcomponents/rootfs_auto_update/rootfs_auto_update.hpp" #include "zservice_container/zservice_container.hpp" #include "zwebservice/zwebservice.hpp" //