From 2ac0e5fddda20d2ac7172cf823029c533dcac09d Mon Sep 17 00:00:00 2001 From: crueter Date: Thu, 9 Oct 2025 22:17:02 -0400 Subject: [PATCH] oops Signed-off-by: crueter --- externals/nx_tzdb/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/externals/nx_tzdb/CMakeLists.txt b/externals/nx_tzdb/CMakeLists.txt index 07eb825559..500d1fc3a4 100644 --- a/externals/nx_tzdb/CMakeLists.txt +++ b/externals/nx_tzdb/CMakeLists.txt @@ -35,7 +35,6 @@ endif() if(NOT YUZU_TZDB_PATH STREQUAL "") set(NX_TZDB_BASE_DIR "${YUZU_TZDB_PATH}") - set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo") elseif (OFF) # (MSVC AND NOT CXX_CLANG) # TODO(crueter): This is a terrible solution, but MSVC fails to link without it # Need to investigate further but I still can't reproduce... @@ -43,9 +42,8 @@ elseif (OFF) # (MSVC AND NOT CXX_CLANG) set(NX_TZDB_ARCHIVE "${CPM_SOURCE_CACHE}/nx_tzdb/${NX_TZDB_VERSION}.zip") set(NX_TZDB_BASE_DIR "${CPM_SOURCE_CACHE}/nx_tzdb/tz") - set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo") - set(NX_TZDB_DOWNLOAD_URL "https://github.com/crueter/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip") + set(NX_TZDB_DOWNLOAD_URL "https://git.crueter.xyz/misc/tzdb_to_nx/releases/download/${NX_TZDB_VERSION}/${NX_TZDB_VERSION}.zip") message(STATUS "Downloading time zone data from ${NX_TZDB_DOWNLOAD_URL}...") file(DOWNLOAD ${NX_TZDB_DOWNLOAD_URL} ${NX_TZDB_ARCHIVE} @@ -65,10 +63,11 @@ else() message(STATUS "Downloading time zone data...") AddJsonPackage(tzdb) - set(NX_TZDB_BASE_DIR "${CPM_SOURCE_CACHE}/nx_tzdb") - set(NX_TZDB_TZ_DIR "${nx_tzdb_SOURCE_DIR}") + set(NX_TZDB_BASE_DIR "${nx_tzdb_SOURCE_DIR}") endif() +set(NX_TZDB_TZ_DIR "${NX_TZDB_BASE_DIR}/zoneinfo") + target_include_directories(nx_tzdb INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/include INTERFACE ${NX_TZDB_INCLUDE_DIR})