From 36c5c7b9c592302aa21b04a4621438049224b150 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Tue, 12 Feb 2013 15:27:39 +0100 Subject: [PATCH] Cmake build: 1.) Sort function checcking alphabetically 2.) add definition HAVE_UNSETENV to header --- development/cmake/ConfigureChecks.cmake | 46 ++++--------------- development/cmake/configCompiler.h.cmake | 56 +++++++++++++----------- 2 files changed, 39 insertions(+), 63 deletions(-) diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake index cb6c4d40e7..83552cd755 100644 --- a/development/cmake/ConfigureChecks.cmake +++ b/development/cmake/ConfigureChecks.cmake @@ -40,44 +40,14 @@ check_include_files(string.h HAVE_STRING_H) check_include_files(argz.h HAVE_ARGZ_H) -check_function_exists(open HAVE_OPEN) -check_function_exists(chmod HAVE_CHMOD) -check_function_exists(close HAVE_CLOSE) -check_function_exists(dcgettext HAVE_DCGETTEXT) -check_function_exists(popen HAVE_POPEN) -check_function_exists(pclose HAVE_PCLOSE) -check_function_exists(_open HAVE__OPEN) -check_function_exists(_close HAVE__CLOSE) -check_function_exists(_popen HAVE__POPEN) -check_function_exists(_pclose HAVE__PCLOSE) -check_function_exists(getpid HAVE_GETPID) -check_function_exists(gettext HAVE_GETTEXT) -check_function_exists(_getpid HAVE__GETPID) -check_function_exists(mkdir HAVE_MKDIR) -check_function_exists(_mkdir HAVE__MKDIR) -check_function_exists(setenv HAVE_SETENV) -check_function_exists(unsetenv HAVE_UNSETENV) -check_function_exists(putenv HAVE_PUTENV) -check_function_exists(fcntl HAVE_FCNTL) -check_function_exists(strerror HAVE_STRERROR) -check_function_exists(getcwd HAVE_GETCWD) -check_function_exists(stpcpy HAVE_STPCPY) -check_function_exists(strcasecmp HAVE_STRCASECMP) -check_function_exists(strdup HAVE_STRDUP) -check_function_exists(strtoul HAVE_STRTOUL) -check_function_exists(alloca HAVE_ALLOCA) -check_function_exists(__fsetlocking HAVE___FSETLOCKING) -check_function_exists(mempcpy HAVE_MEMPCPY) -check_function_exists(__argz_count HAVE___ARGZ_COUNT) -check_function_exists(__argz_next HAVE___ARGZ_NEXT) -check_function_exists(__argz_stringify HAVE___ARGZ_STRINGIFY) -check_function_exists(setlocale HAVE_SETLOCALE) -check_function_exists(tsearch HAVE_TSEARCH) -check_function_exists(getegid HAVE_GETEGID) -check_function_exists(getgid HAVE_GETGID) -check_function_exists(getuid HAVE_GETUID) -check_function_exists(wcslen HAVE_WCSLEN) -check_function_exists(mkfifo HAVE_MKFIFO) +foreach(_f alloca __argz_count __argz_next __argz_stringify + chmod close _close dcgettext fcntl fork __fsetlocking + getcwd getegid getgid getpid _getpid gettext getuid lstat mempcpy mkdir _mkdir + mkfifo open _open pclose _pclose popen _popen putenv readlink + setenv setlocale strcasecmp stpcpy strdup strerror strtoul tsearch unsetenv wcslen) + string(TOUPPER ${_f} _UF) + check_function_exists(${_f} HAVE_${_UF}) +endforeach() check_symbol_exists(alloca "malloc.h" HAVE_SYMBOL_ALLOCA) check_symbol_exists(asprintf "stdio.h" HAVE_ASPRINTF) diff --git a/development/cmake/configCompiler.h.cmake b/development/cmake/configCompiler.h.cmake index 5af2eee2f7..912c315b73 100644 --- a/development/cmake/configCompiler.h.cmake +++ b/development/cmake/configCompiler.h.cmake @@ -29,50 +29,56 @@ #cmakedefine HAVE_OSTREAM 1 #cmakedefine HAVE_IOS 1 #cmakedefine HAVE_LOCALE 1 -#cmakedefine HAVE_OPEN 1 + +#cmakedefine HAVE___ARGZ_COUNT 1 +#cmakedefine HAVE___ARGZ_NEXT 1 +#cmakedefine HAVE___ARGZ_STRINGIFY 1 #cmakedefine HAVE_CHMOD 1 #cmakedefine HAVE_CLOSE 1 -#cmakedefine HAVE_DCGETTEXT 1 -#cmakedefine HAVE_POPEN 1 -#cmakedefine HAVE_PCLOSE 1 -#cmakedefine HAVE__OPEN 1 #cmakedefine HAVE__CLOSE 1 -#cmakedefine HAVE__POPEN 1 -#cmakedefine HAVE__PCLOSE 1 +#cmakedefine HAVE_DCGETTEXT 1 +#cmakedefine HAVE_FCNTL 1 +#cmakedefine HAVE_FORK +#cmakedefine HAVE___FSETLOCKING 1 +#cmakedefine HAVE_GETCWD 1 +#cmakedefine HAVE_GETEGID 1 +#cmakedefine HAVE_GETGID 1 #cmakedefine HAVE_GETPID 1 #cmakedefine HAVE__GETPID 1 #cmakedefine HAVE_GETTEXT 1 +#cmakedefine HAVE_GETUID 1 +#cmakedefine HAVE_LSTAT 1 +#cmakedefine HAVE_MEMPCPY 1 #cmakedefine HAVE_MKDIR 1 #cmakedefine HAVE__MKDIR 1 +#cmakedefine HAVE_MKFIFO 1 +#cmakedefine HAVE_OPEN 1 +#cmakedefine HAVE__OPEN 1 +#cmakedefine HAVE_PCLOSE 1 +#cmakedefine HAVE__PCLOSE 1 +#cmakedefine HAVE_POPEN 1 +#cmakedefine HAVE__POPEN 1 #cmakedefine HAVE_PUTENV 1 +#cmakedefine HAVE_READLINK 1 #cmakedefine HAVE_SETENV 1 +#cmakedefine HAVE_SETLOCALE 1 +#cmakedefine HAVE_STPCPY 1 +#cmakedefine HAVE_STRCASECMP 1 +#cmakedefine HAVE_STRDUP 1 #cmakedefine HAVE_STRERROR 1 +#cmakedefine HAVE_STRTOUL 1 +#cmakedefine HAVE_TSEARCH 1 +#cmakedefine HAVE_UNSETENV 1 +#cmakedefine HAVE_WCSLEN 1 + #cmakedefine HAVE_STD_COUNT 1 #cmakedefine HAVE_ASPRINTF 1 #cmakedefine HAVE_WPRINTF 1 #cmakedefine HAVE_SNPRINTF 1 #cmakedefine HAVE_POSIX_PRINTF 1 -#cmakedefine HAVE_FCNTL 1 #cmakedefine HAVE_INTMAX_T 1 #cmakedefine HAVE_INTTYPES_H_WITH_UINTMAX 1 #cmakedefine CXX_GLOBAL_CSTD 1 -#cmakedefine HAVE_GETCWD 1 -#cmakedefine HAVE_STPCPY 1 -#cmakedefine HAVE_STRCASECMP 1 -#cmakedefine HAVE_STRDUP 1 -#cmakedefine HAVE_STRTOUL 1 -#cmakedefine HAVE___FSETLOCKING 1 -#cmakedefine HAVE_MEMPCPY 1 -#cmakedefine HAVE___ARGZ_COUNT 1 -#cmakedefine HAVE___ARGZ_NEXT 1 -#cmakedefine HAVE___ARGZ_STRINGIFY 1 -#cmakedefine HAVE_SETLOCALE 1 -#cmakedefine HAVE_TSEARCH 1 -#cmakedefine HAVE_GETEGID 1 -#cmakedefine HAVE_GETGID 1 -#cmakedefine HAVE_GETUID 1 -#cmakedefine HAVE_WCSLEN 1 -#cmakedefine HAVE_MKFIFO 1 #cmakedefine HAVE_WPRINTF 1 #cmakedefine HAVE_LONG_DOUBLE 1 #cmakedefine HAVE_LONG_LONG 1 -- 2.39.2