Merge topic 'WriteCompilerDetectionHeader-compiler-versions'
ddec418aFeatures: Add compiler version support to WriteCompilerDetectionHeader.b7029576Project: Add configurable name for version computation macros.78acaafeProject: Separate simulated compiler id from version detection.567af1a5WCDH: Issue a better message for version compatibility.
This commit is contained in:
Brad King
CMake Topic Stage
commit
487b6ccdcd
|
|
@ -17,6 +17,7 @@ function(_readFile file)
|
|||
get_filename_component(name ${file} NAME_WE)
|
||||
string(REGEX REPLACE "-.*" "" CompilerId ${name})
|
||||
set(_compiler_id_version_compute_${CompilerId} ${_compiler_id_version_compute} PARENT_SCOPE)
|
||||
set(_compiler_id_simulate_${CompilerId} ${_compiler_id_simulate} PARENT_SCOPE)
|
||||
set(_compiler_id_pp_test_${CompilerId} ${_compiler_id_pp_test} PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
|
|
@ -114,7 +115,9 @@ function(compiler_id_detection outvar lang)
|
|||
endif()
|
||||
set(id_content "${pp_if} ${_compiler_id_pp_test_${Id}}\n")
|
||||
if (CID_ID_STRING)
|
||||
set(id_content "${id_content}# define ${CID_PREFIX}COMPILER_ID \"${Id}\"")
|
||||
set(PREFIX ${CID_PREFIX})
|
||||
string(CONFIGURE "${_compiler_id_simulate_${Id}}" SIMULATE_BLOCK @ONLY)
|
||||
set(id_content "${id_content}# define ${CID_PREFIX}COMPILER_ID \"${Id}\"${SIMULATE_BLOCK}")
|
||||
endif()
|
||||
if (CID_ID_DEFINE)
|
||||
set(id_content "${id_content}# undef ${CID_PREFIX}COMPILER_IS_${Id}\n")
|
||||
|
|
@ -122,6 +125,8 @@ function(compiler_id_detection outvar lang)
|
|||
endif()
|
||||
if (CID_VERSION_STRINGS)
|
||||
set(PREFIX ${CID_PREFIX})
|
||||
set(MACRO_DEC DEC)
|
||||
set(MACRO_HEX HEX)
|
||||
string(CONFIGURE "${_compiler_id_version_compute_${Id}}" VERSION_BLOCK @ONLY)
|
||||
set(id_content "${id_content}${VERSION_BLOCK}\n")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ set(_compiler_id_pp_test "defined(__VISUALDSPVERSION__) || defined(__ADSPBLACKFI
|
|||
set(_compiler_id_version_compute "
|
||||
#if defined(__VISUALDSPVERSION__)
|
||||
/* __VISUALDSPVERSION__ = 0xVVRRPP00 */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR HEX(__VISUALDSPVERSION__>>24)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR HEX(__VISUALDSPVERSION__>>16 & 0xFF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH HEX(__VISUALDSPVERSION__>>8 & 0xFF)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__VISUALDSPVERSION__>>24)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__VISUALDSPVERSION__>>16 & 0xFF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__VISUALDSPVERSION__>>8 & 0xFF)
|
||||
#endif")
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@ set(_compiler_id_pp_test "defined(__clang__) && defined(__apple_build_version__)
|
|||
include("${CMAKE_CURRENT_LIST_DIR}/Clang-DetermineCompilerInternal.cmake")
|
||||
|
||||
set(_compiler_id_version_compute "${_compiler_id_version_compute}
|
||||
# define @PREFIX@COMPILER_VERSION_TWEAK DEC(__apple_build_version__)")
|
||||
# define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(__apple_build_version__)")
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(_compiler_id_pp_test "defined(__BORLANDC__)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __BORLANDC__ = 0xVRR */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR HEX(__BORLANDC__>>8)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR HEX(__BORLANDC__ & 0xFF)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__BORLANDC__>>8)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__BORLANDC__ & 0xFF)")
|
||||
|
|
|
|||
|
|
@ -1,11 +1,15 @@
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__clang_major__)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__clang_minor__)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__clang_patchlevel__)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__clang_major__)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__clang_minor__)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__clang_patchlevel__)
|
||||
# if defined(_MSC_VER)
|
||||
/* _MSC_VER = VVRR */
|
||||
# define @PREFIX@SIMULATE_VERSION_MAJOR @MACRO_DEC@(_MSC_VER / 100)
|
||||
# define @PREFIX@SIMULATE_VERSION_MINOR @MACRO_DEC@(_MSC_VER % 100)
|
||||
# endif")
|
||||
|
||||
set(_compiler_id_simulate "
|
||||
# if defined(_MSC_VER)
|
||||
# define @PREFIX@SIMULATE_ID \"MSVC\"
|
||||
/* _MSC_VER = VVRR */
|
||||
# define @PREFIX@SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100)
|
||||
# define @PREFIX@SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -3,5 +3,5 @@ set(_compiler_id_pp_test "defined(__COMO__)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __COMO_VERSION__ = VRR */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__COMO_VERSION__ / 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__COMO_VERSION__ % 100)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__COMO_VERSION__ / 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__COMO_VERSION__ % 100)")
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ set(_compiler_id_pp_test "defined(__DECC)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __DECC_VER = VVRRTPPPP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__DECC_VER/10000000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__DECC_VER/100000 % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__DECC_VER % 10000)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__DECC_VER/10000000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__DECC_VER/100000 % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__DECC_VER % 10000)")
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ set(_compiler_id_pp_test "defined(__DECCXX)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __DECCXX_VER = VVRRTPPPP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__DECCXX_VER/10000000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__DECCXX_VER/100000 % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__DECCXX_VER % 10000)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__DECCXX_VER/10000000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__DECCXX_VER/100000 % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__DECCXX_VER % 10000)")
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@
|
|||
set(_compiler_id_pp_test "defined(_CRAYC)")
|
||||
|
||||
set(_compiler_id_version_compute "
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(_RELEASE)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(_RELEASE_MINOR)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(_RELEASE)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(_RELEASE_MINOR)")
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
set(_compiler_id_pp_test "defined(__BORLANDC__) && defined(__CODEGEARC_VERSION__)")
|
||||
|
||||
set(_compiler_id_version_compute "
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR HEX(__CODEGEARC_VERSION__>>24 & 0x00FF)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR HEX(__CODEGEARC_VERSION__>>16 & 0x00FF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH HEX(__CODEGEARC_VERSION__ & 0xFFFF)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__CODEGEARC_VERSION__>>24 & 0x00FF)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__CODEGEARC_VERSION__>>16 & 0x00FF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__CODEGEARC_VERSION__ & 0xFFFF)")
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
set(_compiler_id_pp_test "defined(__GNUC__)")
|
||||
|
||||
set(_compiler_id_version_compute "
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__GNUC__)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__GNUC_MINOR__)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__GNUC__)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__GNUC_MINOR__)
|
||||
# if defined(__GNUC_PATCHLEVEL__)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__GNUC_PATCHLEVEL__)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__GNUC_PATCHLEVEL__)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ set(_compiler_id_pp_test "defined(__HP_cc)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __HP_cc = VVRRPP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__HP_cc/10000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__HP_cc/100 % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__HP_cc % 100)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__HP_cc/10000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__HP_cc/100 % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__HP_cc % 100)")
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ set(_compiler_id_pp_test "defined(__HP_aCC)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __HP_aCC = VVRRPP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__HP_aCC/10000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__HP_aCC/100 % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__HP_aCC % 100)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__HP_aCC/10000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__HP_aCC/100 % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__HP_aCC % 100)")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __IBMC__ = VRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__IBMC__/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__IBMC__/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__IBMC__ % 10)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__IBMC__/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__IBMC__/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__IBMC__ % 10)")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __IBMCPP__ = VRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__IBMCPP__/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__IBMCPP__/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__IBMCPP__ % 10)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__IBMCPP__/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__IBMCPP__/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__IBMCPP__ % 10)")
|
||||
|
|
|
|||
|
|
@ -3,20 +3,24 @@ set(_compiler_id_pp_test "defined(__INTEL_COMPILER) || defined(__ICC)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __INTEL_COMPILER = VRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__INTEL_COMPILER/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__INTEL_COMPILER/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__INTEL_COMPILER/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__INTEL_COMPILER/10 % 10)
|
||||
# if defined(__INTEL_COMPILER_UPDATE)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER_UPDATE)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__INTEL_COMPILER_UPDATE)
|
||||
# else
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__INTEL_COMPILER % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__INTEL_COMPILER % 10)
|
||||
# endif
|
||||
# if defined(__INTEL_COMPILER_BUILD_DATE)
|
||||
/* __INTEL_COMPILER_BUILD_DATE = YYYYMMDD */
|
||||
# define @PREFIX@COMPILER_VERSION_TWEAK DEC(__INTEL_COMPILER_BUILD_DATE)
|
||||
# define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(__INTEL_COMPILER_BUILD_DATE)
|
||||
# endif
|
||||
# if defined(_MSC_VER)
|
||||
# define @PREFIX@SIMULATE_ID \"MSVC\"
|
||||
/* _MSC_VER = VVRR */
|
||||
# define @PREFIX@SIMULATE_VERSION_MAJOR DEC(_MSC_VER / 100)
|
||||
# define @PREFIX@SIMULATE_VERSION_MINOR DEC(_MSC_VER % 100)
|
||||
# define @PREFIX@SIMULATE_VERSION_MAJOR @MACRO_DEC@(_MSC_VER / 100)
|
||||
# define @PREFIX@SIMULATE_VERSION_MINOR @MACRO_DEC@(_MSC_VER % 100)
|
||||
# endif")
|
||||
|
||||
set(_compiler_id_simulate "
|
||||
# if defined(_MSC_VER)
|
||||
# define @PREFIX@SIMULATE_ID \"MSVC\"
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ set(_compiler_id_pp_test "defined(_SGI_COMPILER_VERSION) || defined(_COMPILER_VE
|
|||
set(_compiler_id_version_compute "
|
||||
# if defined(_SGI_COMPILER_VERSION)
|
||||
/* _SGI_COMPILER_VERSION = VRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(_SGI_COMPILER_VERSION/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(_SGI_COMPILER_VERSION/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(_SGI_COMPILER_VERSION % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(_SGI_COMPILER_VERSION/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(_SGI_COMPILER_VERSION/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(_SGI_COMPILER_VERSION % 10)
|
||||
# else
|
||||
/* _COMPILER_VERSION = VRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(_COMPILER_VERSION/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(_COMPILER_VERSION/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(_COMPILER_VERSION % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(_COMPILER_VERSION/100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(_COMPILER_VERSION/10 % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(_COMPILER_VERSION % 10)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -3,17 +3,17 @@ set(_compiler_id_pp_test "defined(_MSC_VER)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* _MSC_VER = VVRR */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(_MSC_VER / 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(_MSC_VER % 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(_MSC_VER / 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(_MSC_VER % 100)
|
||||
# if defined(_MSC_FULL_VER)
|
||||
# if _MSC_VER >= 1400
|
||||
/* _MSC_FULL_VER = VVRRPPPPP */
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 100000)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(_MSC_FULL_VER % 100000)
|
||||
# else
|
||||
/* _MSC_FULL_VER = VVRRPPPP */
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(_MSC_FULL_VER % 10000)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(_MSC_FULL_VER % 10000)
|
||||
# endif
|
||||
# endif
|
||||
# if defined(_MSC_BUILD)
|
||||
# define @PREFIX@COMPILER_VERSION_TWEAK DEC(_MSC_BUILD)
|
||||
# define @PREFIX@COMPILER_VERSION_TWEAK @MACRO_DEC@(_MSC_BUILD)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ set(_compiler_id_pp_test "defined(__WATCOMC__)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __WATCOMC__ = VVRP + 1100 */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC((__WATCOMC__ - 1100) / 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@((__WATCOMC__ - 1100) / 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@((__WATCOMC__ / 10) % 10)
|
||||
# if (__WATCOMC__ % 10) > 0
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__WATCOMC__ % 10)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
set(_compiler_id_pp_test "defined(__PGI)")
|
||||
|
||||
set(_compiler_id_version_compute "
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__PGIC__)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__PGIC_MINOR__)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__PGIC__)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__PGIC_MINOR__)
|
||||
# if defined(__PGIC_PATCHLEVEL__)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__PGIC_PATCHLEVEL__)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__PGIC_PATCHLEVEL__)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
set(_compiler_id_pp_test "defined(__PATHCC__)")
|
||||
|
||||
set(_compiler_id_version_compute "
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__PATHCC__)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__PATHCC_MINOR__)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__PATHCC__)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__PATHCC_MINOR__)
|
||||
# if defined(__PATHCC_PATCHLEVEL__)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__PATHCC_PATCHLEVEL__)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__PATHCC_PATCHLEVEL__)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ set(_compiler_id_pp_test "defined(SDCC)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* SDCC = VRP */
|
||||
# define COMPILER_VERSION_MAJOR DEC(SDCC/100)
|
||||
# define COMPILER_VERSION_MINOR DEC(SDCC/10 % 10)
|
||||
# define COMPILER_VERSION_PATCH DEC(SDCC % 10)")
|
||||
# define COMPILER_VERSION_MAJOR @MACRO_DEC@(SDCC/100)
|
||||
# define COMPILER_VERSION_MINOR @MACRO_DEC@(SDCC/10 % 10)
|
||||
# define COMPILER_VERSION_PATCH @MACRO_DEC@(SDCC % 10)")
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ set(_compiler_id_pp_test "defined(__SUNPRO_C)")
|
|||
set(_compiler_id_version_compute "
|
||||
# if __SUNPRO_C >= 0x5100
|
||||
/* __SUNPRO_C = 0xVRRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>12)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xFF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH HEX(__SUNPRO_C & 0xF)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__SUNPRO_C>>12)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__SUNPRO_C>>4 & 0xFF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__SUNPRO_C & 0xF)
|
||||
# else
|
||||
/* __SUNPRO_CC = 0xVRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR HEX(__SUNPRO_C>>8)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR HEX(__SUNPRO_C>>4 & 0xF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH HEX(__SUNPRO_C & 0xF)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__SUNPRO_C>>8)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__SUNPRO_C>>4 & 0xF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__SUNPRO_C & 0xF)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ set(_compiler_id_pp_test "defined(__SUNPRO_CC)")
|
|||
set(_compiler_id_version_compute "
|
||||
# if __SUNPRO_CC >= 0x5100
|
||||
/* __SUNPRO_CC = 0xVRRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>12)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xFF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH HEX(__SUNPRO_CC & 0xF)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__SUNPRO_CC>>12)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__SUNPRO_CC>>4 & 0xFF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__SUNPRO_CC & 0xF)
|
||||
# else
|
||||
/* __SUNPRO_CC = 0xVRP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR HEX(__SUNPRO_CC>>8)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR HEX(__SUNPRO_CC>>4 & 0xF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH HEX(__SUNPRO_CC & 0xF)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_HEX@(__SUNPRO_CC>>8)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_HEX@(__SUNPRO_CC>>4 & 0xF)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_HEX@(__SUNPRO_CC & 0xF)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@ set(_compiler_id_pp_test "defined(__TI_COMPILER_VERSION__)")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __TI_COMPILER_VERSION__ = VVVRRRPPP */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__TI_COMPILER_VERSION__/1000000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC(__TI_COMPILER_VERSION__/1000 % 1000)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__TI_COMPILER_VERSION__ % 1000)")
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__TI_COMPILER_VERSION__/1000000)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@(__TI_COMPILER_VERSION__/1000 % 1000)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__TI_COMPILER_VERSION__ % 1000)")
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ set(_compiler_id_pp_test "defined(__WATCOMC__) && __WATCOMC__ < 1200")
|
|||
|
||||
set(_compiler_id_version_compute "
|
||||
/* __WATCOMC__ = VVRR */
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR DEC(__WATCOMC__ / 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR DEC((__WATCOMC__ / 10) % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_MAJOR @MACRO_DEC@(__WATCOMC__ / 100)
|
||||
# define @PREFIX@COMPILER_VERSION_MINOR @MACRO_DEC@((__WATCOMC__ / 10) % 10)
|
||||
# if (__WATCOMC__ % 10) > 0
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH DEC(__WATCOMC__ % 10)
|
||||
# define @PREFIX@COMPILER_VERSION_PATCH @MACRO_DEC@(__WATCOMC__ % 10)
|
||||
# endif")
|
||||
|
|
|
|||
|
|
@ -52,7 +52,15 @@
|
|||
# Feature Test Macros
|
||||
# ===================
|
||||
#
|
||||
# For each compiler, a preprocessor test of the compiler version is generated
|
||||
# For each compiler, a preprocessor macro is generated matching
|
||||
# ``<PREFIX>_COMPILER_IS_<compiler>`` which has the content either ``0``
|
||||
# or ``1``, depending on the compiler in use. Preprocessor macros for
|
||||
# compiler version components are generated matching
|
||||
# ``<PREFIX>_COMPILER_VERSION_MAJOR`` ``<PREFIX>_COMPILER_VERSION_MINOR``
|
||||
# and ``<PREFIX>_COMPILER_VERSION_PATCH`` containing decimal values
|
||||
# for the corresponding compiler version components, if defined.
|
||||
#
|
||||
# A preprocessor test is generated based on the compiler version
|
||||
# denoting whether each feature is enabled. A preprocessor macro
|
||||
# matching ``<PREFIX>_COMPILER_<FEATURE>``, where ``<FEATURE>`` is the
|
||||
# upper-case ``<feature>`` name, is generated to contain the value
|
||||
|
|
@ -187,6 +195,8 @@ function(_load_compiler_variables CompilerId lang)
|
|||
foreach(feature ${ARGN})
|
||||
set(_cmake_feature_test_${CompilerId}_${feature} ${_cmake_feature_test_${feature}} PARENT_SCOPE)
|
||||
endforeach()
|
||||
include("${CMAKE_ROOT}/Modules/Compiler/${CompilerId}-DetermineCompiler.cmake" OPTIONAL)
|
||||
set(_compiler_id_version_compute_${CompilerId} ${_compiler_id_version_compute} PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
function(write_compiler_detection_header
|
||||
|
|
@ -218,19 +228,33 @@ function(write_compiler_detection_header
|
|||
if(NOT _WCD_VERSION)
|
||||
set(_WCD_VERSION ${CMAKE_MINIMUM_REQUIRED_VERSION})
|
||||
endif()
|
||||
if (_WCD_VERSION VERSION_LESS 3.1.0) # Version which introduced this function
|
||||
message(FATAL_ERROR "VERSION parameter too low.")
|
||||
set(_min_version 3.1.0) # Version which introduced this function
|
||||
if (_WCD_VERSION VERSION_LESS _min_version)
|
||||
set(err "VERSION compatibility for write_compiler_detection_header is set to ${_WCD_VERSION}, which is too low.")
|
||||
set(err "${err} It must be set to at least ${_min_version}. ")
|
||||
set(err "${err} Either set the VERSION parameter to the write_compiler_detection_header function, or update")
|
||||
set(err "${err} your minimum required CMake version with the cmake_minimum_required command.")
|
||||
message(FATAL_ERROR "${err}")
|
||||
endif()
|
||||
|
||||
set(compilers
|
||||
GNU
|
||||
Clang
|
||||
)
|
||||
|
||||
set(_hex_compilers ADSP Borland Embarcadero SunPro)
|
||||
|
||||
foreach(_comp ${_WCD_COMPILERS})
|
||||
list(FIND compilers ${_comp} idx)
|
||||
if (idx EQUAL -1)
|
||||
message(FATAL_ERROR "Unsupported compiler ${_comp}.")
|
||||
endif()
|
||||
if (NOT _need_hex_conversion)
|
||||
list(FIND _hex_compilers ${_comp} idx)
|
||||
if (NOT idx EQUAL -1)
|
||||
set(_need_hex_conversion TRUE)
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
set(file_content "
|
||||
|
|
@ -244,6 +268,21 @@ function(write_compiler_detection_header
|
|||
set(file_content "${file_content}\n${_WCD_PROLOG}\n")
|
||||
endif()
|
||||
|
||||
if (_need_hex_conversion)
|
||||
set(file_content "${file_content}
|
||||
#define ${prefix_arg}_DEC(X) (X)
|
||||
#define ${prefix_arg}_HEX(X) ( \\
|
||||
((X)>>28 & 0xF) * 10000000 + \\
|
||||
((X)>>24 & 0xF) * 1000000 + \\
|
||||
((X)>>20 & 0xF) * 100000 + \\
|
||||
((X)>>16 & 0xF) * 10000 + \\
|
||||
((X)>>12 & 0xF) * 1000 + \\
|
||||
((X)>>8 & 0xF) * 100 + \\
|
||||
((X)>>4 & 0xF) * 10 + \\
|
||||
((X) & 0xF) \\
|
||||
)\n")
|
||||
endif()
|
||||
|
||||
foreach(feature ${_WCD_FEATURES})
|
||||
if (feature MATCHES "^cxx_")
|
||||
list(APPEND _langs CXX)
|
||||
|
|
@ -287,6 +326,21 @@ function(write_compiler_detection_header
|
|||
# if !(${_cmake_oldestSupported_${compiler}})
|
||||
# error Unsupported compiler version
|
||||
# endif\n")
|
||||
|
||||
set(PREFIX ${prefix_arg}_)
|
||||
if (_need_hex_conversion)
|
||||
set(MACRO_DEC ${prefix_arg}_DEC)
|
||||
set(MACRO_HEX ${prefix_arg}_HEX)
|
||||
else()
|
||||
set(MACRO_DEC)
|
||||
set(MACRO_HEX)
|
||||
endif()
|
||||
string(CONFIGURE "${_compiler_id_version_compute_${compiler}}" VERSION_BLOCK @ONLY)
|
||||
set(file_content "${file_content}${VERSION_BLOCK}\n")
|
||||
set(PREFIX)
|
||||
set(MACRO_DEC)
|
||||
set(MACRO_HEX)
|
||||
|
||||
set(pp_if "elif")
|
||||
foreach(feature ${${_lang}_features})
|
||||
string(TOUPPER ${feature} feature_upper)
|
||||
|
|
|
|||
|
|
@ -35,6 +35,10 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES)
|
|||
return()
|
||||
endif()
|
||||
|
||||
string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" COMPILER_VERSION_MAJOR "${CMAKE_CXX_COMPILER_VERSION}")
|
||||
string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" COMPILER_VERSION_MINOR "${CMAKE_CXX_COMPILER_VERSION}")
|
||||
string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" COMPILER_VERSION_PATCH "${CMAKE_CXX_COMPILER_VERSION}")
|
||||
|
||||
macro(set_defines target true_defs false_defs)
|
||||
set(defines)
|
||||
foreach(def ${true_defs})
|
||||
|
|
@ -46,6 +50,9 @@ macro(set_defines target true_defs false_defs)
|
|||
target_compile_definitions(${target}
|
||||
PRIVATE
|
||||
${defines}
|
||||
EXPECTED_COMPILER_VERSION_MAJOR=${COMPILER_VERSION_MAJOR}
|
||||
EXPECTED_COMPILER_VERSION_MINOR=${COMPILER_VERSION_MINOR}
|
||||
EXPECTED_COMPILER_VERSION_PATCH=${COMPILER_VERSION_PATCH}
|
||||
)
|
||||
endmacro()
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,18 @@
|
|||
#error cxx_variadic_templates expected availability did not match.
|
||||
#endif
|
||||
|
||||
#if !CHECK(VERSION_MAJOR)
|
||||
#error Compiler major version did not match.
|
||||
#endif
|
||||
|
||||
#if !CHECK(VERSION_MINOR)
|
||||
#error Compiler minor version did not match.
|
||||
#endif
|
||||
|
||||
#if !CHECK(VERSION_PATCH)
|
||||
#error Compiler patch version did not match.
|
||||
#endif
|
||||
|
||||
int main()
|
||||
{
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
CMake Error at .*Modules/WriteCompilerDetectionHeader.cmake:[0-9]+ \(message\):
|
||||
VERSION parameter too low.
|
||||
VERSION compatibility for write_compiler_detection_header is set to 3.0,
|
||||
which is too low. It must be set to at least 3.1.0. Either set the
|
||||
VERSION parameter to the write_compiler_detection_header function, or
|
||||
update your minimum required CMake version with the cmake_minimum_required
|
||||
command.
|
||||
Call Stack \(most recent call first\):
|
||||
OldVersion.cmake:4 \(write_compiler_detection_header\)
|
||||
CMakeLists.txt:3 \(include\)
|
||||
|
|
|
|||
Loading…
Reference in New Issue