summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ConfigureChecks.cmake9
-rw-r--r--ReleaseNotes.txt1
2 files changed, 9 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index ddb64604..b568c10c 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -77,7 +77,14 @@ check_type_size(intptr_t SIZEOF_INTPTR_T)
check_type_size(pid_t SIZEOF_PID_T)
check_type_size(size_t SIZEOF_SIZE_T)
check_type_size(ssize_t SIZEOF_SSIZE_T)
-check_type_size(time_t SIZEOF_TIME_T)
+if(WIN32 AND MSVC AND USE_32BIT_TIME_T)
+ set(_SAVE_RQD ${CMAKE_REQUIRED_DEFINITIONS})
+ set(CMAKE_REQUIRED_DEFINITIONS -D_USE_32BIT_TIME_T)
+ check_type_size(time_t SIZEOF_TIME_T)
+ set(CMAKE_REQUIRED_DEFINITIONS ${_SAVE_RQD})
+else()
+ check_type_size(time_t SIZEOF_TIME_T)
+endif()
check_type_size(wint_t SIZEOF_WINT_T)
include(FindThreads)
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 6f66a838..65ceb8fb 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -4,6 +4,7 @@ Release Highlights
Version 3.0.15 (UNRELEASED):
----------------------------
* Add missing property parameters into libical-glib
+ * Fix CMake option USE_32BIT_TIME_T actually uses a 32-bit time_t value
Version 3.0.14 (05 February 2022):
----------------------------------