CheckTypeSize: Add support for C++
Previously if headers required to check the size of a type can be compiled with C++ compiler only, the check would fail because the C compiler fails. As a consequence, HAVE_${VARIABLE} would be set to false, and ${VARIABLE} will be empty. Teach CHECK_TYPE_SIZE to accept a new optional argument LANGUAGE that allows one to explicitly set the compiler to use. The new signature is therefore: CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY] [LANGUAGE <language>])
This commit is contained in:
parent
bf02e75079
commit
07a2342fbc
|
@ -6,7 +6,8 @@
|
||||||
#
|
#
|
||||||
# ::
|
# ::
|
||||||
#
|
#
|
||||||
# CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY])
|
# CHECK_TYPE_SIZE(TYPE VARIABLE [BUILTIN_TYPES_ONLY]
|
||||||
|
# [LANGUAGE <language>])
|
||||||
#
|
#
|
||||||
# Check if the type exists and determine its size. On return,
|
# Check if the type exists and determine its size. On return,
|
||||||
# "HAVE_${VARIABLE}" holds the existence of the type, and "${VARIABLE}"
|
# "HAVE_${VARIABLE}" holds the existence of the type, and "${VARIABLE}"
|
||||||
|
@ -36,6 +37,9 @@
|
||||||
# check automatically includes the available headers, thus supporting
|
# check automatically includes the available headers, thus supporting
|
||||||
# checks of types defined in the headers.
|
# checks of types defined in the headers.
|
||||||
#
|
#
|
||||||
|
# If LANGUAGE is set, the specified compiler will be used to perform the
|
||||||
|
# check. Acceptable values are C and CXX
|
||||||
|
#
|
||||||
# Despite the name of the macro you may use it to check the size of more
|
# Despite the name of the macro you may use it to check the size of more
|
||||||
# complex expressions, too. To check e.g. for the size of a struct
|
# complex expressions, too. To check e.g. for the size of a struct
|
||||||
# member you can do something like this:
|
# member you can do something like this:
|
||||||
|
@ -79,7 +83,7 @@ get_filename_component(__check_type_size_dir "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
# Helper function. DO NOT CALL DIRECTLY.
|
# Helper function. DO NOT CALL DIRECTLY.
|
||||||
function(__check_type_size_impl type var map builtin)
|
function(__check_type_size_impl type var map builtin language)
|
||||||
message(STATUS "Check size of ${type}")
|
message(STATUS "Check size of ${type}")
|
||||||
|
|
||||||
# Include header files.
|
# Include header files.
|
||||||
|
@ -101,8 +105,13 @@ function(__check_type_size_impl type var map builtin)
|
||||||
|
|
||||||
# Perform the check.
|
# Perform the check.
|
||||||
|
|
||||||
|
if("${language}" STREQUAL "C")
|
||||||
set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c)
|
set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.c)
|
||||||
|
elseif("${language}" STREQUAL "CXX")
|
||||||
|
set(src ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.cpp)
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Unknown language:\n ${language}\nSupported languages: C, CXX.\n")
|
||||||
|
endif()
|
||||||
set(bin ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.bin)
|
set(bin ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${var}.bin)
|
||||||
configure_file(${__check_type_size_dir}/CheckTypeSize.c.in ${src} @ONLY)
|
configure_file(${__check_type_size_dir}/CheckTypeSize.c.in ${src} @ONLY)
|
||||||
try_compile(HAVE_${var} ${CMAKE_BINARY_DIR} ${src}
|
try_compile(HAVE_${var} ${CMAKE_BINARY_DIR} ${src}
|
||||||
|
@ -176,8 +185,36 @@ endfunction()
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
macro(CHECK_TYPE_SIZE TYPE VARIABLE)
|
macro(CHECK_TYPE_SIZE TYPE VARIABLE)
|
||||||
|
# parse arguments
|
||||||
|
unset(doing)
|
||||||
|
foreach(arg ${ARGN})
|
||||||
|
if("x${arg}" STREQUAL "xBUILTIN_TYPES_ONLY")
|
||||||
|
set(_CHECK_TYPE_SIZE_${arg} 1)
|
||||||
|
unset(doing)
|
||||||
|
elseif("x${arg}" STREQUAL "xLANGUAGE") # change to MATCHES for more keys
|
||||||
|
set(doing "${arg}")
|
||||||
|
set(_CHECK_TYPE_SIZE_${doing} "")
|
||||||
|
elseif("x${doing}" STREQUAL "xLANGUAGE")
|
||||||
|
set(_CHECK_TYPE_SIZE_${doing} "${arg}")
|
||||||
|
unset(doing)
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "Unknown argument:\n ${arg}\n")
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
if("x${doing}" MATCHES "^x(LANGUAGE)$")
|
||||||
|
message(FATAL_ERROR "Missing argument:\n ${doing} arguments requires a value\n")
|
||||||
|
endif()
|
||||||
|
if(DEFINED _CHECK_TYPE_SIZE_LANGUAGE)
|
||||||
|
if(NOT "x${_CHECK_TYPE_SIZE_LANGUAGE}" MATCHES "^x(C|CXX)$")
|
||||||
|
message(FATAL_ERROR "Unknown language:\n ${_CHECK_TYPE_SIZE_LANGUAGE}.\nSupported languages: C, CXX.\n")
|
||||||
|
endif()
|
||||||
|
set(_language ${_CHECK_TYPE_SIZE_LANGUAGE})
|
||||||
|
else()
|
||||||
|
set(_language C)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Optionally check for standard headers.
|
# Optionally check for standard headers.
|
||||||
if("${ARGV2}" STREQUAL "BUILTIN_TYPES_ONLY")
|
if(_CHECK_TYPE_SIZE_BUILTIN_TYPES_ONLY)
|
||||||
set(_builtin 0)
|
set(_builtin 0)
|
||||||
else()
|
else()
|
||||||
set(_builtin 1)
|
set(_builtin 1)
|
||||||
|
@ -190,7 +227,7 @@ macro(CHECK_TYPE_SIZE TYPE VARIABLE)
|
||||||
set(${VARIABLE}_KEYS)
|
set(${VARIABLE}_KEYS)
|
||||||
set(_map_file ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${VARIABLE}.cmake)
|
set(_map_file ${CMAKE_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/CheckTypeSize/${VARIABLE}.cmake)
|
||||||
if(NOT DEFINED HAVE_${VARIABLE})
|
if(NOT DEFINED HAVE_${VARIABLE})
|
||||||
__check_type_size_impl(${TYPE} ${VARIABLE} ${_map_file} ${_builtin})
|
__check_type_size_impl(${TYPE} ${VARIABLE} ${_map_file} ${_builtin} ${_language})
|
||||||
endif()
|
endif()
|
||||||
include(${_map_file} OPTIONAL)
|
include(${_map_file} OPTIONAL)
|
||||||
set(_map_file)
|
set(_map_file)
|
||||||
|
|
Loading…
Reference in New Issue