From 1e82342033110edf7fa5bf486099cf45cb447661 Mon Sep 17 00:00:00 2001 From: lat9nq <22451773+lat9nq@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:22:53 -0500 Subject: [PATCH] CMake: Find and require intl It's not guaranteed for Apple systems to have this library installed, apparently, so check for it. --- CMakeLists.txt | 4 ++++ externals/tz/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 87c8950..9986f6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,5 +4,9 @@ project(tzdb2nx VERSION 1.0) set(CMAKE_CXX_STANDARD 20) +if (APPLE) + find_package(Intl REQUIRED) +endif() + add_subdirectory(externals) add_subdirectory(src) diff --git a/externals/tz/CMakeLists.txt b/externals/tz/CMakeLists.txt index 1bec606..c1288e7 100644 --- a/externals/tz/CMakeLists.txt +++ b/externals/tz/CMakeLists.txt @@ -15,7 +15,7 @@ if (NOT EXISTS "${TZ_DIR}" OR NOT EXISTS "${TZIF_LIST_FILE}") file(COPY ${TZ_SOURCE_DIR}/ DESTINATION ${TZ_TMP_SOURCE_DIR}) if (APPLE) - set(TZ_MAKEFLAGS "LDLIBS=-lintl") + set(TZ_MAKEFLAGS "LDLIBS=${Intl_LIBRARY}") else() set(TZ_MAKEFLAGS) endif()