From b990a23095edaf763a05794133c28e7910ab980b Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 29 Nov 2015 14:02:44 +0100 Subject: [PATCH] Changed: Removed useless checks in config.h --- code/CMakeModules/ConfigureChecks.cmake | 44 +------------------------ code/config.h.cmake | 33 ------------------- 2 files changed, 1 insertion(+), 76 deletions(-) diff --git a/code/CMakeModules/ConfigureChecks.cmake b/code/CMakeModules/ConfigureChecks.cmake index baf6e0e7c..0236ddef0 100644 --- a/code/CMakeModules/ConfigureChecks.cmake +++ b/code/CMakeModules/ConfigureChecks.cmake @@ -1,47 +1,5 @@ MACRO(NL_CONFIGURE_CHECKS) - INCLUDE(CheckIncludeFiles) - INCLUDE(CheckFunctionExists) - INCLUDE(CheckLibraryExists) - INCLUDE(CheckTypeSize) - - CHECK_INCLUDE_FILES ("execinfo.h" HAVE_EXECINFO_H) - CHECK_INCLUDE_FILES ("stdint.h" HAVE_STDINT_H) - CHECK_INCLUDE_FILES ("sys/types.h" HAVE_SYS_TYPES_H) - CHECK_INCLUDE_FILES ("inttypes.h" HAVE_INTTYPES_H) - CHECK_INCLUDE_FILES ("unistd.h" HAVE_UNISTD_H) - CHECK_INCLUDE_FILES ("utime.h" HAVE_UTIME_H) - - CHECK_INCLUDE_FILES ("dl.h" HAVE_DL_H) - CHECK_INCLUDE_FILES ("limits.h" HAVE_LIMITS_H) - CHECK_INCLUDE_FILES ("malloc.h" HAVE_MALLOC_H) - CHECK_INCLUDE_FILES ("sys/param.h" HAVE_SYS_PARAM_H) - CHECK_INCLUDE_FILES ("sys/param.h;sys/mount.h" HAVE_SYS_MOUNT_H) - CHECK_INCLUDE_FILES ("sys/statvfs.h" HAVE_SYS_STATVFS_H) - - CHECK_INCLUDE_FILES ("pthread.h" HAVE_PTHREAD) - - CHECK_TYPE_SIZE("size_t" SIZEOF_SIZE_T) - #if (NOT HAVE_SIZEOF_SIZE_T) - # MESSAGE(FATAL_ERROR "size_t is not present on this architecture - aborting") - #endif (NOT HAVE_SIZEOF_SIZE_T) - MESSAGE(STATUS "DEBUG size_t is ${SIZEOF_SIZE_T}") - - CHECK_TYPE_SIZE("off_t" SIZEOF_OFF_T) - MESSAGE(STATUS "DEBUG off_t is ${SIZEOF_OFF_T}") - - CHECK_FUNCTION_EXISTS("backtrace" HAVE_BACKTRACE) - CHECK_FUNCTION_EXISTS("getsockname" HAVE_GETSOCKNAME) - CHECK_FUNCTION_EXISTS("inet_ntoa" HAVE_INET_NTOA) - CHECK_FUNCTION_EXISTS("inet_ntop" HAVE_INET_NTOP) - CHECK_FUNCTION_EXISTS("inet_pton" HAVE_INET_PTON) - CHECK_FUNCTION_EXISTS("regcomp" HAVE_REGCOMP) - CHECK_FUNCTION_EXISTS("strerror" HAVE_STRERROR) - CHECK_FUNCTION_EXISTS("strlcat" HAVE_STRLCAT) - CHECK_FUNCTION_EXISTS("strptime" HAVE_STRPTIME) - CHECK_FUNCTION_EXISTS("strtok_r" HAVE_STRTOK_R) - CHECK_FUNCTION_EXISTS("strtoull" HAVE_STRTOULL) - CHECK_FUNCTION_EXISTS("statvfs" HAVE_STATVFS) - CHECK_FUNCTION_EXISTS("stat64" HAVE_STAT64) + INCLUDE(GetRevision) # 3D drivers IF(WITH_DRIVER_OPENGL) diff --git a/code/config.h.cmake b/code/config.h.cmake index d3c9f701d..55a02b232 100644 --- a/code/config.h.cmake +++ b/code/config.h.cmake @@ -1,39 +1,6 @@ #ifndef CONFIG_H #define CONFIG_H -#cmakedefine HAVE_DL_H 1 -#cmakedefine HAVE_EXECINFO_H 1 -#cmakedefine HAVE_ICONV 1 -#cmakedefine HAVE_INTTYPES_H 1 -#cmakedefine HAVE_LANGINFO_CODESET 1 -#cmakedefine HAVE_LIMITS_H 1 -#cmakedefine HAVE_MALLOC_H 1 -#cmakedefine HAVE_PAM_MISC_H 1 -#cmakedefine HAVE_PAM_PAM_APPL_H 1 -#cmakedefine HAVE_PTHREAD 1 -#cmakedefine HAVE_SECURITY_PAM_APPL_H 1 -#cmakedefine HAVE_SECURITY_PAM_MISC_H 1 -#cmakedefine HAVE_STDINT_H 1 -#cmakedefine HAVE_SYS_MOUNT_H 1 -#cmakedefine HAVE_SYS_PARAM_H 1 -#cmakedefine HAVE_SYS_STATVFS_H 1 -#cmakedefine HAVE_SYS_TYPES_H 1 -#cmakedefine HAVE_UNISTD_H 1 -#cmakedefine HAVE_UTIME_H 1 -#cmakedefine HAVE_WCHAR_H 1 - -#cmakedefine HAVE_BACKTRACE 1 -#cmakedefine HAVE_INET_NTOA 1 -#cmakedefine HAVE_INET_NTOP 1 -#cmakedefine HAVE_INET_PTON 1 -#cmakedefine HAVE_STRERROR 1 -#cmakedefine HAVE_STRLCAT 1 -#cmakedefine HAVE_STRPTIME 1 -#cmakedefine HAVE_STRTOK_R 1 -#cmakedefine HAVE_STRTOULL 1 -#cmakedefine HAVE_STATVFS 1 -#cmakedefine HAVE_STAT64 1 - #cmakedefine NL_OPENGL_AVAILABLE ${NL_OPENGL_AVAILABLE} #cmakedefine NL_OPENGLES_AVAILABLE ${NL_OPENGLES_AVAILABLE} #cmakedefine NL_DIRECT3D_AVAILABLE ${NL_DIRECT3D_AVAILABLE}