Skip to content
Snippets Groups Projects

Sweeping !772 from master to LCG_100-patches. Add proper compiler version with suffix to buildinfostring for gcc 10.3.0.fpCloses SPI-1904

Merged Sweeping !772 from master to LCG_100-patches. Add proper compiler version with suffix to buildinfostring for gcc 10.3.0.fpCloses SPI-1904
cherry-pick-2-86b13fe6-LCG_100-patches into LCG_100-patches
Merged Ghost User requested to merge cherry-pick-2-86b13fe6-LCG_100-patches into LCG_100-patches
Compare
and
1 file
+ 7
− 1
Compare changes
  • Side-by-side
  • Inline
cmake/modules/lcgsoft-macros.cmake
+ 7
− 1
@@ -464,7 +464,13 @@ macro(LCGPackage_Add name)
#---Compile information needed for the build description file (installed alongside version.txt)
set(buildinfostring " COMPILER: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION},")
# Change version of compiler adding fp suffix if it contains "fp" in version
if ( "${CMAKE_CXX_COMPILER}" MATCHES ".*${CMAKE_CXX_COMPILER_VERSION}.fp.*" )
set(buildinfostring " COMPILER: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}.fp,")
else()
set(buildinfostring " COMPILER: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION},")
endif()
site_name(hostname)
set(buildinfostring "${buildinfostring} HOSTNAME: ${hostname},")
set(buildinfostring "${buildinfostring} GITHASH: ${lcgcmakerevision},")