From 77d3239866419c2088a8d857130accb85dcc9657 Mon Sep 17 00:00:00 2001 From: Riku Isokoski Date: Wed, 11 May 2022 11:35:24 +0300 Subject: [PATCH] Use submodule for date lib A directory has been renamed --- .gitmodules | 3 +++ src/CMakeLists.txt | 18 +++++++++--------- src/libs/date | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) create mode 160000 src/libs/date diff --git a/.gitmodules b/.gitmodules index 8d302ae7..3902644c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "src/libs/QCBOR"] path = src/libs/QCBOR url = https://github.com/laurencelundblade/QCBOR.git +[submodule "src/libs/date"] + path = src/libs/date + url = https://github.com/HowardHinnant/date.git diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 372e089e..6069aca6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -652,14 +652,14 @@ set(INCLUDE_FILES drivers/Cst816s.h FreeRTOS/portmacro.h FreeRTOS/portmacro_cmsis.h - libs/date/includes/date/tz.h - libs/date/includes/date/chrono_io.h - libs/date/includes/date/date.h - libs/date/includes/date/islamic.h - libs/date/includes/date/iso_week.h - libs/date/includes/date/julian.h - libs/date/includes/date/ptz.h - libs/date/includes/date/tz_private.h + libs/date/include/date/tz.h + libs/date/include/date/chrono_io.h + libs/date/include/date/date.h + libs/date/include/date/islamic.h + libs/date/include/date/iso_week.h + libs/date/include/date/julian.h + libs/date/include/date/ptz.h + libs/date/include/date/tz_private.h displayapp/LittleVgl.h displayapp/lv_pinetime_theme.h systemtask/SystemTask.h @@ -682,7 +682,7 @@ include_directories( ../ libs/ FreeRTOS/ - libs/date/includes + libs/date/include libs/mynewt-nimble/porting/npl/freertos/include libs/mynewt-nimble/nimble/include libs/mynewt-nimble/porting/nimble/include diff --git a/src/libs/date b/src/libs/date new file mode 160000 index 00000000..9502bc27 --- /dev/null +++ b/src/libs/date @@ -0,0 +1 @@ +Subproject commit 9502bc27a3b32fa5759ea82a76c22551620ebcd2