Skip to content

Commit 1947969

Browse files
committed
cmake: support date submodule include dir
Support both the current modified `date/includes` directory and the `date` submodules `date/include` directory. Once InfiniTimeOrg/InfiniTime#1183 is merged and the InfiniTime submodule is checked in also update the GitHub Action and the AUR package. Fixes: #42
1 parent a594446 commit 1947969

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,13 @@ target_include_directories(infinisim PRIVATE "${InfiniTime_DIR}/src/libs")
149149
target_include_directories(infinisim PRIVATE "lv_drivers")
150150

151151
# add dates library
152-
target_include_directories(infinisim SYSTEM PRIVATE "${InfiniTime_DIR}/src/libs/date/includes")
152+
if(EXISTS "${InfiniTime_DIR}/src/libs/date/includes")
153+
target_include_directories(infinisim SYSTEM PRIVATE "${InfiniTime_DIR}/src/libs/date/includes")
154+
elseif(EXISTS "${InfiniTime_DIR}/src/libs/date/include")
155+
target_include_directories(infinisim SYSTEM PRIVATE "${InfiniTime_DIR}/src/libs/date/include")
156+
else()
157+
message(FATAL_ERROR "can't fine date includes/include directory, is the submodule checked out?")
158+
endif()
153159

154160
# add Screens, fonts and icons with a globbing expression,
155161
# to enable easier CI test-runs for PRs adding new Screens/Fonts/Icons

0 commit comments

Comments
 (0)