X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=cmake%2FConfigureChecks.cmake;h=33a9cee298f41dca7fa7f2ab9531ea29c2716051;hb=7aed4eb923b3c6a8aafcdb9a4e35a0924005c833;hp=756d67fe120d1c22145066ec470f4f6c68d527a0;hpb=452ff68a2d81beb55c43713bc226a51b7c3d38a7;p=platform%2Fupstream%2Fdbus.git diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake index 756d67f..33a9cee 100644 --- a/cmake/ConfigureChecks.cmake +++ b/cmake/ConfigureChecks.cmake @@ -10,11 +10,16 @@ check_include_file(sys/poll.h HAVE_POLL) # dbus-sysdeps.c, dbus-sysdeps-w check_include_file(sys/time.h HAVE_SYS_TIME_H)# dbus-sysdeps-win.c check_include_file(sys/wait.h HAVE_SYS_WAIT_H)# dbus-sysdeps-win.c check_include_file(time.h HAVE_TIME_H) # dbus-sysdeps-win.c +check_include_file(ws2tcpip.h HAVE_WS2TCPIP_H)# dbus-sysdeps-win.c check_include_file(wspiapi.h HAVE_WSPIAPI_H) # dbus-sysdeps-win.c check_include_file(unistd.h HAVE_UNISTD_H) # dbus-sysdeps-util-win.c check_include_file(stdio.h HAVE_STDIO_H) # dbus-sysdeps.h check_include_file(sys/syslimits.h HAVE_SYS_SYSLIMITS_H) # dbus-sysdeps-unix.c check_include_file(errno.h HAVE_ERRNO_H) # dbus-sysdeps.c +check_include_file(signal.h HAVE_SIGNAL_H) +check_include_file(locale.h HAVE_LOCALE_H) +check_include_file(inttypes.h HAVE_INTTYPES_H) # dbus-pipe.h +check_include_file(stdint.h HAVE_STDINT_H) # dbus-pipe.h check_symbol_exists(backtrace "execinfo.h" HAVE_BACKTRACE) # dbus-sysdeps.c, dbus-sysdeps-win.c check_symbol_exists(getgrouplist "grp.h" HAVE_GETGROUPLIST) # dbus-sysdeps.c @@ -22,11 +27,16 @@ check_symbol_exists(getpeerucred "ucred.h" HAVE_GETPEERUCRED) # check_symbol_exists(nanosleep "time.h" HAVE_NANOSLEEP) # dbus-sysdeps.c check_symbol_exists(getpwnam_r "errno.h pwd.h" HAVE_POSIX_GETPWNAM_R) # dbus-sysdeps-util-unix.c check_symbol_exists(setenv "stdlib.h" HAVE_SETENV) # dbus-sysdeps.c -check_symbol_exists(socketpair "sys/socket.h" HAVE_SOCKETPAIR) # dbus-sysdeps.c check_symbol_exists(unsetenv "stdlib.h" HAVE_UNSETENV) # dbus-sysdeps.c +check_symbol_exists(clearenv "stdlib.h" HAVE_CLEARENV) # dbus-sysdeps.c 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 +check_symbol_exists(strtoull "stdlib.h" HAVE_STRTOULL) # dbus-send.c check_struct_member(cmsgcred cmcred_pid "sys/types.h sys/socket.h" HAVE_CMSGCRED) # dbus-sysdeps.c @@ -44,50 +54,50 @@ check_type_size("__int64" SIZEOF___INT64) if(SIZEOF_INT EQUAL 8) set (DBUS_HAVE_INT64 1) set (DBUS_INT64_TYPE "int") -else(SIZEOF_INT EQUAL 8) - if(SIZEOF_LONG EQUAL 8) - set (DBUS_HAVE_INT64 1) - set (DBUS_INT64_TYPE "long") - else(SIZEOF_LONG EQUAL 8) - if(SIZEOF_LONG_LONG EQUAL 8) - set (DBUS_HAVE_INT64 1) - set (DBUS_INT64_TYPE "long long") - else(SIZEOF_LONG_LONG EQUAL 8) - if(SIZEOF___INT64 EQUAL 8) - set (DBUS_HAVE_INT64 1) - set (DBUS_INT64_TYPE "__int64") - endif(SIZEOF___INT64 EQUAL 8) - endif(SIZEOF_LONG_LONG EQUAL 8) - endif(SIZEOF_LONG EQUAL 8) + set (DBUS_INT64_CONSTANT "(val)") + set (DBUS_UINT64_CONSTANT "(val##U)") +elseif(SIZEOF_LONG EQUAL 8) + set (DBUS_HAVE_INT64 1) + set (DBUS_INT64_TYPE "long") + set (DBUS_INT64_CONSTANT "(val##L)") + set (DBUS_UINT64_CONSTANT "(val##UL)") +elseif(SIZEOF_LONG_LONG EQUAL 8) + set (DBUS_HAVE_INT64 1) + set (DBUS_INT64_TYPE "long long") + set (DBUS_INT64_CONSTANT "(val##LL)") + set (DBUS_UINT64_CONSTANT "(val##ULL)") +elseif(SIZEOF___INT64 EQUAL 8) + set (DBUS_HAVE_INT64 1) + set (DBUS_INT64_TYPE "__int64") + set (DBUS_INT64_CONSTANT "(val##i64)") + set (DBUS_UINT64_CONSTANT "(val##ui64)") endif(SIZEOF_INT EQUAL 8) # DBUS_INT32_TYPE if(SIZEOF_INT EQUAL 4) set (DBUS_INT32_TYPE "int") -else(SIZEOF_INT EQUAL 4) - if(SIZEOF_LONG EQUAL 4) - set (DBUS_INT32_TYPE "long") - else(SIZEOF_LONG EQUAL 4) - if(SIZEOF_LONG_LONG EQUAL 4) - set (DBUS_INT32_TYPE "long long") - endif(SIZEOF_LONG_LONG EQUAL 4) - endif(SIZEOF_LONG EQUAL 4) +elseif(SIZEOF_LONG EQUAL 4) + set (DBUS_INT32_TYPE "long") +elseif(SIZEOF_LONG_LONG EQUAL 4) + set (DBUS_INT32_TYPE "long long") endif(SIZEOF_INT EQUAL 4) # DBUS_INT16_TYPE if(SIZEOF_INT EQUAL 2) set (DBUS_INT16_TYPE "int") -else(SIZEOF_INT EQUAL 2) - if(SIZEOF_SHORT EQUAL 2) - set (DBUS_INT16_TYPE "short") - endif(SIZEOF_SHORT EQUAL 2) +elseif(SIZEOF_SHORT EQUAL 2) + set (DBUS_INT16_TYPE "short") endif(SIZEOF_INT EQUAL 2) find_program(DOXYGEN doxygen) find_program(XMLTO xmlto) +if(MSVC) + SET(DBUS_VA_COPY_FUNC "_DBUS_VA_COPY_ASSIGN";) +else(MSVC) write_file("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c" "#include - void f (int i, ...) { + #include + static void f (int i, ...) { va_list args1, args2; va_start (args1, i); va_copy (args2, args1); @@ -105,10 +115,11 @@ try_compile(DBUS_HAVE_VA_COPY ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c) if(DBUS_HAVE_VA_COPY) - SET(DBUS_VA_COPY va_copy CACHE STRING "va_copy function") + SET(DBUS_VA_COPY_FUNC va_copy CACHE STRING "va_copy function") else(DBUS_HAVE_VA_COPY) write_file("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c" "#include - void f (int i, ...) { + #include + static void f (int i, ...) { va_list args1, args2; va_start (args1, i); __va_copy (args2, args1); @@ -121,10 +132,29 @@ else(DBUS_HAVE_VA_COPY) return 0; } ") - try_compile(DBUS_HAVE_VA_COPY + try_compile(DBUS_HAVE___VA_COPY ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/cmake_try_compile.c) if(DBUS_HAVE___VA_COPY) - SET(DBUS_VA_COPY __va_copy CACHE STRING "va_copy function") + SET(DBUS_VA_COPY_FUNC __va_copy CACHE STRING "va_copy function") + else(DBUS_HAVE___VA_COPY) + SET(DBUS_VA_COPY_AS_ARRAY "1" CACHE STRING "'va_lists' cannot be copies as values") endif(DBUS_HAVE___VA_COPY) endif(DBUS_HAVE_VA_COPY) +endif(MSVC) # _not_ MSVC +#### Abstract sockets + +if (DBUS_ENABLE_ABSTRACT_SOCKETS) + + try_compile(HAVE_ABSTRACT_SOCKETS + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/modules/CheckForAbstractSockets.c) + +endif(DBUS_ENABLE_ABSTRACT_SOCKETS) + +if(HAVE_ABSTRACT_SOCKETS) + set(DBUS_PATH_OR_ABSTRACT_VALUE abstract) +else(HAVE_ABSTRACT_SOCKETS) + set(DBUS_PATH_OR_ABSTRACT_VALUE path) +endif(HAVE_ABSTRACT_SOCKETS) +