From e78dc9b3db076a3163f408203fb1c96cd931d8ea Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 16 Apr 2023 17:36:16 -0500 Subject: [PATCH] Add date-tz to wxdata when not using MSVC --- external/CMakeLists.txt | 2 ++ external/date.cmake | 7 +++++++ wxdata/wxdata.cmake | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 external/date.cmake diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 873203d6..65b2ef20 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -5,6 +5,7 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS aws-sdk-cpp.cmake + date.cmake freetype-gl.cmake hsluv-c.cmake imgui.cmake @@ -12,6 +13,7 @@ set_property(DIRECTORY stb.cmake) include(aws-sdk-cpp.cmake) +include(date.cmake) include(freetype-gl.cmake) include(hsluv-c.cmake) include(imgui.cmake) diff --git a/external/date.cmake b/external/date.cmake new file mode 100644 index 00000000..a804f68c --- /dev/null +++ b/external/date.cmake @@ -0,0 +1,7 @@ +cmake_minimum_required(VERSION 3.20) +set(PROJECT_NAME scwx-date) + +set(USE_SYSTEM_TZ_DB ON) +set(BUILD_TZ_LIB ON) + +add_subdirectory(date) diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index a6471187..d12b763a 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -246,6 +246,10 @@ if (WIN32) target_link_libraries(wxdata INTERFACE Ws2_32) endif() +if (NOT MSVC) + target_link_libraries(wxdata PUBLIC date::date-tz) +endif() + set_target_properties(wxdata PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED ON CXX_EXTENSIONS OFF)