diff options
author | Guy Harris <guy@alum.mit.edu> | 2013-10-10 23:54:53 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2013-10-10 23:54:53 +0000 |
commit | e5336d281b29c69430fd4d4ab1ea425a7dddf6d9 (patch) | |
tree | 74af355d749956741eaa9e911dbfa1bf07774859 /ConfigureChecks.cmake | |
parent | 2f067f20ddac4eef6b386a886f703d0a9a6bf760 (diff) | |
download | wireshark-e5336d281b29c69430fd4d4ab1ea425a7dddf6d9.tar.gz wireshark-e5336d281b29c69430fd4d4ab1ea425a7dddf6d9.tar.bz2 wireshark-e5336d281b29c69430fd4d4ab1ea425a7dddf6d9.zip |
Move the QT_MACEXTRAS_LIB cmakedefine in cmakeconfig.h.in to the
equivalent location in config.h.in, to simplify comparing the two files.
Add some tests from the autoconf script to CMake:
check for setresgid() and setresuid();
check for struct stat having an st_flags member.
Get rid of INTTYPES_H_DEFINES_FORMATS; we don't appear to check for it,
and we don't use it (we're using GLib's formatting functions, which have
their own way of handling 64-bit integers).
Get rid of STDC_HEADERS; it's in autoconf because autoconf was
originally developed back when you couldn't rely in ANSI C and has never
been removed, and something we're using for other purposes checks for
it, not because we explicitly test for it, but we don't test it in the
code, and CMake doesn't even check for it.
svn path=/trunk/; revision=52522
Diffstat (limited to 'ConfigureChecks.cmake')
-rw-r--r-- | ConfigureChecks.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 784518adc8..3e3f62f74c 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -83,11 +83,14 @@ check_function_exists("mmap" HAVE_MMAP) check_function_exists("mprotect" HAVE_MPROTECT) check_function_exists("mkdtemp" HAVE_MKDTEMP) check_function_exists("mkstemp" HAVE_MKSTEMP) +check_function_exists("setresgid" HAVE_SETRESGID) +check_function_exists("setresuid" HAVE_SETRESUID) check_function_exists("sysconf" HAVE_SYSCONF) #Struct members include(CheckStructHasMember) -check_struct_has_member("struct tm" tm_zone time.h HAVE_TM_ZONE) +check_struct_has_member("struct stat" st_flags sys/stat.h HAVE_ST_FLAGS) +check_struct_has_member("struct tm" tm_zone time.h HAVE_TM_ZONE) #Symbols but NOT enums or types include(CheckSymbolExists) |