Merge branch 'CLHEP_LCG97_Update-master-20200403' into 'master'

CLHEP LCG_97 Update, master branch (2020.04.03.)

See merge request !652

Build/AtlasLCG/modules/FindCLHEP.cmake

-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 # Try to find CLHEP
 #
@@ -54,4 +54,8 @@ set( CLHEP_DEFINITIONS -DCLHEP_MAX_MIN_DEFINED
 add_definitions( ${CLHEP_DEFINITIONS} )
 
 # Set up the RPM dependency:
-lcg_need_rpm( CLHEP )
+if( "${LCG_VERSION_NUMBER}" VERSION_LESS 97 )
+   lcg_need_rpm( CLHEP )
+else()
+   lcg_need_rpm( clhep )
+endif()