diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-03-04 14:10:17 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-03-05 08:14:24 +0100 |
| commit | 8696bfdf07a65f1887a907db869f8986fd21a40a (patch) | |
| tree | 9a391c3f0ae9fac1ac8139cfb1382a01aad49211 /cmake | |
| parent | 2d2b5af97df063569c6f719e9d58beffa1b1b8bd (diff) | |
| download | dbus-8696bfdf07a65f1887a907db869f8986fd21a40a.tar.gz | |
Fix broken cmake HAVE_SOCKLEN_T type finding check.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=17289
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ConfigureChecks.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index 06bd186f..697db869 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -32,7 +32,6 @@ check_symbol_exists(clearenv "stdlib.h" HAVE_CLEARENV) # check_symbol_exists(writev "sys/uio.h" HAVE_WRITEV) # dbus-sysdeps.c, dbus-sysdeps-win.c check_symbol_exists(setrlimit "sys/resource.h" HAVE_SETRLIMIT) # dbus-sysdeps.c, dbus-sysdeps-win.c, test/test-segfault.c check_symbol_exists(socketpair "sys/socket.h" HAVE_SOCKETPAIR) # dbus-sysdeps.c -check_symbol_exists(socklen_t "sys/socket.h" HAVE_SOCKLEN_T) # dbus-sysdeps-unix.c check_symbol_exists(setlocale "locale.h" HAVE_SETLOCALE) # dbus-test-main.c check_symbol_exists(localeconv "locale.h" HAVE_LOCALECONV) # dbus-sysdeps.c check_symbol_exists(strtoll "stdlib.h" HAVE_STRTOLL) # dbus-send.c @@ -57,6 +56,9 @@ check_type_size("int" SIZEOF_INT) check_type_size("long" SIZEOF_LONG) check_type_size("long long" SIZEOF_LONG_LONG) check_type_size("__int64" SIZEOF___INT64) +set(CMAKE_EXTRA_INCLUDE_FILES "sys/socket.h") +check_type_size("socklen_t" SOCKLEN_T) # dbus-sysdeps-unix.c +set(CMAKE_EXTRA_INCLUDE_FILES) # DBUS_INT64_TYPE if(SIZEOF_INT EQUAL 8) |