From 5aa2347f22807b05e888908f4f4948d4121c8194 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Sat, 25 May 2019 14:49:59 +0200 Subject: cmake: support CMAKE_OSX_ARCHITECTURES when detecting SIZEOF variables Closes #3945 --- lib/curl_config.h.cmake | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake index afa59d538..3d96c498c 100644 --- a/lib/curl_config.h.cmake +++ b/lib/curl_config.h.cmake @@ -891,26 +891,35 @@ /* Define to the function return type for send. */ #cmakedefine SEND_TYPE_RETV ${SEND_TYPE_RETV} +/* + Note: SIZEOF_* variables are fetched with CMake through check_type_size(). + As per CMake documentation on CheckTypeSize, C preprocessor code is + generated by CMake into SIZEOF_*_CODE. This is what we use in the + following statements. + + Reference: https://cmake.org/cmake/help/latest/module/CheckTypeSize.html +*/ + /* The size of `int', as computed by sizeof. */ -#cmakedefine SIZEOF_INT ${SIZEOF_INT} +${SIZEOF_INT_CODE} /* The size of `short', as computed by sizeof. */ -#cmakedefine SIZEOF_SHORT ${SIZEOF_SHORT} +${SIZEOF_SHORT_CODE} /* The size of `long', as computed by sizeof. */ -#cmakedefine SIZEOF_LONG ${SIZEOF_LONG} +${SIZEOF_LONG_CODE} /* The size of `off_t', as computed by sizeof. */ -#cmakedefine SIZEOF_OFF_T ${SIZEOF_OFF_T} +${SIZEOF_OFF_T_CODE} /* The size of `curl_off_t', as computed by sizeof. */ -#cmakedefine SIZEOF_CURL_OFF_T ${SIZEOF_CURL_OFF_T} +${SIZEOF_CURL_OFF_T_CODE} /* The size of `size_t', as computed by sizeof. */ -#cmakedefine SIZEOF_SIZE_T ${SIZEOF_SIZE_T} +${SIZEOF_SIZE_T_CODE} /* The size of `time_t', as computed by sizeof. */ -#cmakedefine SIZEOF_TIME_T ${SIZEOF_TIME_T} +${SIZEOF_TIME_T_CODE} /* Define to 1 if you have the ANSI C header files. */ #cmakedefine STDC_HEADERS 1 -- cgit v1.2.3