diff options
| author | Allen Winter <allen.winter@kdab.com> | 2022-06-03 15:59:55 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2022-06-03 15:59:55 -0400 |
| commit | 175abb718bd000413f1db6a82a4ee457d71f8bb4 (patch) | |
| tree | 426a297dc0c78b7b75745af72222157ae64867c4 | |
| parent | 6166e2ffd1decdeeaa080586e91f4843991d3ba2 (diff) | |
| download | libical-git-175abb718bd000413f1db6a82a4ee457d71f8bb4.tar.gz | |
Buildsystem - fix sizeof time_t is 4 with -DUSE_32BIT_TIME_T
fixes: #557
| -rw-r--r-- | ConfigureChecks.cmake | 9 | ||||
| -rw-r--r-- | ReleaseNotes.txt | 1 |
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): ---------------------------------- |