diff options
| author | comex <comexk@gmail.com> | 2023-07-01 15:01:11 -0700 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2023-07-01 15:01:11 -0700 |
| commit | 98685d48e3cb9f25f6919f004ec62cadf33afad2 (patch) | |
| tree | 9df2ce7f57370641589bfae7196c77b090bcbe0f /externals/nx_tzdb | |
| parent | d885dd5b642807d0587acad43668cfccfdf06d1e (diff) | |
| parent | 8857911216f16a098231c25e0d2992ab67e33f83 (diff) | |
Merge remote-tracking branch 'origin/master' into ssl
Diffstat (limited to 'externals/nx_tzdb')
| -rw-r--r-- | externals/nx_tzdb/CMakeLists.txt | 4 | ||||
| m--------- | externals/nx_tzdb/tzdb_to_nx | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/externals/nx_tzdb/CMakeLists.txt b/externals/nx_tzdb/CMakeLists.txt index d5a1c6317..593786250 100644 --- a/externals/nx_tzdb/CMakeLists.txt +++ b/externals/nx_tzdb/CMakeLists.txt @@ -7,7 +7,7 @@ add_library(nx_tzdb INTERFACE) find_program(GIT git) find_program(GNU_MAKE make) -find_program(GNU_DATE date) +find_program(DATE_PROG date) set(CAN_BUILD_NX_TZDB true) @@ -17,7 +17,7 @@ endif() if (NOT GNU_MAKE) set(CAN_BUILD_NX_TZDB false) endif() -if (NOT GNU_DATE) +if (NOT DATE_PROG) set(CAN_BUILD_NX_TZDB false) endif() if (CMAKE_SYSTEM_NAME STREQUAL "Windows" OR ANDROID) diff --git a/externals/nx_tzdb/tzdb_to_nx b/externals/nx_tzdb/tzdb_to_nx -Subproject 34df65eff295c2bd9ee9e6a077d662486d5cabb +Subproject 212afa2394a74226dcf1b7996a570aae17debb6 |