Browse Source

Utilities: Update hard-coded try_compile results for third-party libraries

The integer size checks have been replaced with KWIML so their
hard-coded results are no longer needed.

Tell `TEST_BIG_ENDIAN` to use `unsigned short` as the 16-bit integer.

UNIX device APIs do not exist on Windows.

FreeBSD libmd does not exist on Windows.

Fix typo in existing `HAVE_READPASSPHRASE_H` setting.
Brad King 5 years ago
parent
commit
6c4f3dcd7b
1 changed files with 12 additions and 4 deletions
  1. 12 4
      Utilities/cmThirdPartyChecks.cmake

+ 12 - 4
Utilities/cmThirdPartyChecks.cmake

@@ -19,9 +19,10 @@ set(HAVE_STRFTIME 1)
 set(HAVE_STRING_H 1)
 set(HAVE_STRRCHR 1)
 set(HAVE_WCHAR_H 1)
-set(SIZEOF_INT 4)
-set(SIZEOF_LONG_LONG 8)
-set(SIZEOF_SHORT 2)
+
+# Used by TEST_BIG_ENDIAN.
+set(CMAKE_SIZEOF_UNSIGNED_SHORT 2)
+set(HAVE_CMAKE_SIZEOF_UNSIGNED_SHORT 1)
 
 if(WIN32)
   # Results for builds targeting Windows platforms.
@@ -151,7 +152,7 @@ if(WIN32)
   set(HAVE_READLINK 0)
   set(HAVE_READLINKAT 0)
   set(HAVE_READPASSPHRASE 0)
-  set(HAVE_READPASSPHRASE 0)
+  set(HAVE_READPASSPHRASE_H 0)
   set(HAVE_REGEX_H 0)
   set(HAVE_RSA_H 0)
   set(HAVE_SELECT 0)
@@ -260,6 +261,13 @@ if(WIN32)
   # curl and expat: stdlib.h, stdarg.h, string.h, float.h
   set(STDC_HEADERS 1)
 
+  # UNIX device APIs do not exist on Windows.
+  set(MAJOR_IN_MKDEV 0)
+  set(MAJOR_IN_SYSMACROS 0)
+
+  # FreeBSD libmd does not exist on Windows.
+  set(LIBMD_FOUND 0)
+
   # libarchive looks for external hash implementations.
   set(ARCHIVE_CRYPTO_MD5_LIBC 0)
   set(ARCHIVE_CRYPTO_MD5_LIBMD 0)