svn commit: r1919441 - /subversion/branches/cmake/CMakeLists.txt

Author: rinrab
Date: Sun Jul 21 12:56:23 2024
New Revision: 1919441

URL: http://svn.apache.org/viewvc?rev=1919441&view=rev
Log:
On the 'cmake' branch: Refactoring with checks.

Factor-out macros for making the checks and recording the result as compile
definitions. The new functions are autocheck_include_files and
autocheck_symbol_exists. These functions simply invokes the checks from
the CMake module and handle the result, so coping behavior of autoconf
macros like AC_CHECK_HEADER.

* CMakeLists.txt
  (autocheck_include_files,
   autocheck_symbol_exists): New macros.

  (checks): Use new macros for the checks instead of built-in functions
   and cleanup 'if's since new macros handle the result automatically.

Modified:
    subversion/branches/cmake/CMakeLists.txt

Modified: subversion/branches/cmake/CMakeLists.txt
URL: http://svn.apache.org/viewvc/subversion/branches/cmake/CMakeLists.txt?rev=1919441&r1=1919440&r2=1919441&view=diff
==============================================================================
--- subversion/branches/cmake/CMakeLists.txt (original)
+++ subversion/branches/cmake/CMakeLists.txt Sun Jul 21 12:56:23 2024
@@ -258,82 +258,46 @@ endfunction()
 
 ### Checks
 
-# TODO: maybe record HAVE_* definitions into svn_private_config.h instead of
-# using add_compile_definitions() ?
-
 include(CheckIncludeFiles)
 include(CheckSymbolExists)
 
-check_include_files("elf.h" HAVE_ELF_H)
-if (HAVE_ELF_H)
-  add_compile_definitions(HAVE_ELF_H)
-endif()
-
-check_include_files("inttypes.h" HAVE_INTTYPES_H)
-if(HAVE_INTTYPES_H)
-  add_compile_definitions(HAVE_INTTYPES_H)
-endif()
-
-check_include_files("stdbool.h" HAVE_STDBOOL_H)
-if(HAVE_STDBOOL_H)
-  add_compile_definitions(HAVE_STDBOOL_H)
-endif()
+macro(autocheck_include_files INCLUDE VARIABLE)
+  check_include_files(${INCLUDE} ${VARIABLE})
+  if(${VARIABLE})
+    add_compile_definitions(${VARIABLE})
+  endif()
+endmacro()
+
+macro(autocheck_symbol_exists SYMBOL FILE VARIABLE)
+  check_symbol_exists(${SYMBOL} ${FILE} ${VARIABLE})
+  if(${VARIABLE})
+    add_compile_definitions(${VARIABLE})
+  endif()
+endmacro()
+
+autocheck_include_files("elf.h" HAVE_ELF_H)
+autocheck_include_files("inttypes.h" HAVE_INTTYPES_H)
+autocheck_include_files("stdbool.h" HAVE_STDBOOL_H)
+autocheck_include_files("stdint.h" HAVE_STDINT_H)
 
-check_include_files("stdint.h" HAVE_STDINT_H)
-if(HAVE_STDINT_H)
-  add_compile_definitions(HAVE_STDINT_H)
-endif()
-
-check_include_files("sys/utsname.h" HAVE_SYS_UTSNAME_H)
+autocheck_include_files("sys/utsname.h" HAVE_SYS_UTSNAME_H)
 if (HAVE_SYS_UTSNAME_H)
-  add_compile_definitions(HAVE_SYS_UTSNAME_H)
-
-  check_symbol_exists("uname" "sys/utsname.h" HAVE_UNAME)
-  if (HAVE_UNAME)
-    add_compile_definitions(HAVE_UNAME)
-  endif()
+  autocheck_symbol_exists("uname" "sys/utsname.h" HAVE_UNAME)
 endif()
 
-check_include_files("sys/types.h" HAVE_SYS_TYPES_H)
-if (HAVE_SYS_TYPES_H)
-  add_compile_definitions(HAVE_SYS_TYPES_H)
-endif()
+autocheck_include_files("sys/types.h" HAVE_SYS_TYPES_H)
 
-check_include_files("termios.h" HAVE_TERMIOS_H)
+autocheck_include_files("termios.h" HAVE_TERMIOS_H)
 if(HAVE_TERMIOS_H)
-  check_symbol_exists("tcgetattr" "termios.h" HAVE_TCGETATTR)
-  if(HAVE_TCGETATTR)
-    add_compile_definitions(HAVE_TCGETATTR)
-  endif()
-
-  check_symbol_exists("tcsetattr" "termios.h" HAVE_TCSETATTR)
-  if(HAVE_TCSETATTR)
-    add_compile_definitions(HAVE_TCSETATTR)
-  endif()
-
-  if (HAVE_TCGETATTR AND HAVE_TCSETATTR)
-    add_compile_definitions(HAVE_TERMIOS_H)
-  endif()
+  autocheck_symbol_exists("tcgetattr" "termios.h" HAVE_TCGETATTR)
+  autocheck_symbol_exists("tcsetattr" "termios.h" HAVE_TCSETATTR)
 endif()
 
-check_include_files("unistd.h" HAVE_UNISTD_H)
+autocheck_include_files("unistd.h" HAVE_UNISTD_H)
 if (HAVE_UNISTD_H)
-  add_compile_definitions(HAVE_UNISTD_H)
-
-  check_symbol_exists("symlink" "unistd.h" HAVE_SYMLINK)
-  if (HAVE_SYMLINK)
-    add_compile_definitions(HAVE_SYMLINK)
-  endif()
-
-  check_symbol_exists("readlink" "unistd.h" HAVE_READLINK)
-  if (HAVE_READLINK)
-    add_compile_definitions(HAVE_READLINK)
-  endif()
-
-  check_symbol_exists("getpid" "unistd.h" HAVE_GETPID)
-  if (HAVE_GETPID)
-    add_compile_definitions(HAVE_GETPID)
-  endif()
+  autocheck_symbol_exists("symlink" "unistd.h" HAVE_SYMLINK)
+  autocheck_symbol_exists("readlink" "unistd.h" HAVE_READLINK)
+  autocheck_symbol_exists("getpid" "unistd.h" HAVE_GETPID)
 endif()
 
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")