diff options
| author | Allen Winter <allen.winter@kdab.com> | 2022-06-03 16:11:54 -0400 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2022-06-03 16:11:54 -0400 |
| commit | 8a02c81153db797703adf2e18be94efe0f0c7b8c (patch) | |
| tree | 79db44bc2c6746ab54a072b8a98b5d060ad15eec | |
| parent | 4f22bbb2d1d1f3a7a218e2d8d363f94a071151c9 (diff) | |
| parent | 454167da5abfe78bc52cc4e89fa5584754aee87f (diff) | |
| download | libical-git-8a02c81153db797703adf2e18be94efe0f0c7b8c.tar.gz | |
Merge branch '3.0'
| -rw-r--r-- | ConfigureChecks.cmake | 9 | ||||
| -rw-r--r-- | ReleaseNotes.txt | 1 | ||||
| -rw-r--r-- | cmake/modules/FindBerkeleyDB.cmake | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 71a4284b..b7aeb9f1 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -80,7 +80,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(${ICAL_ICALTIME_T_TYPE} SIZEOF_ICALTIME_T) check_type_size(wint_t SIZEOF_WINT_T) diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 77f411ca..1c2749f4 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -49,6 +49,7 @@ Version 3.1.0 (NOT RELEASED YET): 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): ---------------------------------- diff --git a/cmake/modules/FindBerkeleyDB.cmake b/cmake/modules/FindBerkeleyDB.cmake index 8acffb36..cca291f5 100644 --- a/cmake/modules/FindBerkeleyDB.cmake +++ b/cmake/modules/FindBerkeleyDB.cmake @@ -98,8 +98,8 @@ else() if(BerkeleyDB_FIND_REQUIRED) # If the find_package(BerkeleyDB REQUIRED) was used, fail since we couldn't find the header message(FATAL_ERROR "Failed to find Berkeley DB's header file \"db.h\"! Try setting \"BerkeleyDB_ROOT_DIR\" when initiating Cmake.") - elseif(NOT BerkeleyDB_FIND_QUIETLY) - message(WARNING "Failed to find Berkeley DB's header file \"db.h\"! Try setting \"BerkeleyDB_ROOT_DIR\" when initiating Cmake.") + #elseif(NOT BerkeleyDB_FIND_QUIETLY) + # message(WARNING "Failed to find Berkeley DB's header file \"db.h\"! Try setting \"BerkeleyDB_ROOT_DIR\" when initiating Cmake.") endif() # Set some garbage values to the versions since we didn't find a file to read set(BerkeleyDB_VERSION_MAJOR "0") |