From d272b2682112c9f3ef2d6e3fce7cd38f54952342 Mon Sep 17 00:00:00 2001
From: Dmitri Konstantinov <dmitri.konstantinov@cern.ch>
Date: Sun, 23 May 2021 13:57:37 +0000
Subject: [PATCH] Merge branch 'SPI-1904_pass_proper_gcc_version_in_txt_files'
into 'master'
Add proper compiler version with suffix to buildinfostring for gcc 10.3.0.fp
Closes SPI-1904
See merge request sft/lcgcmake!772
(cherry picked from commit 86b13fe63b17dc5fd962390c0b8df30558fa0e5c)
49def6d1 Add proper compiler version with suffix to buildinfostring for gcc 10.3.0.fp
---
cmake/modules/lcgsoft-macros.cmake | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/cmake/modules/lcgsoft-macros.cmake b/cmake/modules/lcgsoft-macros.cmake
index eea189ce11..a85030bec9 100644
--- a/cmake/modules/lcgsoft-macros.cmake
+++ b/cmake/modules/lcgsoft-macros.cmake
@@ -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},")
--
GitLab