From 37d244ad360a7d1ee6db33b5defe38074132b1c9 Mon Sep 17 00:00:00 2001
From: Johannes Elmsheuser <johannes.elmsheuser@cern.ch>
Date: Wed, 23 Nov 2016 09:26:04 +0100
Subject: [PATCH] Fix of the tdaq RPM dependency (AtlasCMake-00-01-70-07)
* modules/Findtdaq.cmake: Fix of the tdaq RPM dependency
* Tagging as AtlasCMake-00-01-70-07
2016-11-22 Johannes Elmsheuser <Johannes.Elmsheuser@cern.ch>
* Findtdaq.cmake port new RPM naming schema from trunk
* Tagging as AtlasCMake-00-01-70-06
2016-11-08 OAna Boeriu <oana.boeriu@cern.ch>
* Moved the dbg option outside of the for-loop
* Tagging as AtlasCMake-00-01-70-05
2016-11-08 Oana Boeriu <oana.boeriu@cern.ch>
* Added new UndefinedBehaviorSanitizer output to dbg platform builds option - OBO Stewart Martin-Haugh
* Tagging as AtlasCMake-00-01-70-04
---
Build/AtlasCMake/modules/AtlasCompilerSettings.cmake | 3 ++-
Build/AtlasCMake/modules/Finddqm-common.cmake | 2 +-
Build/AtlasCMake/modules/Findtdaq-common.cmake | 2 +-
Build/AtlasCMake/modules/Findtdaq.cmake | 11 ++++++++---
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake b/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
index 85251d68d9d..0764ec6c64c 100644
--- a/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
+++ b/Build/AtlasCMake/modules/AtlasCompilerSettings.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: AtlasCompilerSettings.cmake 776624 2016-10-05 12:49:54Z krasznaa $
+# $Id: AtlasCompilerSettings.cmake 782946 2016-11-08 12:41:46Z alibrari $
#
# This file collects settings fine-tuning all the compiler and linker options
# used in an ATLAS build in one place. It is included by default when using
@@ -100,6 +100,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
_add_flag( CMAKE_CXX_FLAGS_${mode} "-Wextra" )
_add_flag( CMAKE_CXX_FLAGS_${mode} "-Werror=return-type" )
endforeach()
+ _add_flag( CMAKE_CXX_FLAGS_DEBUG "-fsanitize=undefined" )
endif()
foreach( mode RELEASE RELWITHDEBINFO DEBUG )
_add_flag( CMAKE_CXX_FLAGS_${mode} "-pedantic" )
diff --git a/Build/AtlasCMake/modules/Finddqm-common.cmake b/Build/AtlasCMake/modules/Finddqm-common.cmake
index 9b31a530b88..3c3a8dfc386 100644
--- a/Build/AtlasCMake/modules/Finddqm-common.cmake
+++ b/Build/AtlasCMake/modules/Finddqm-common.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: Finddqm-common.cmake 778186 2016-10-13 08:35:27Z alibrari $
+# $Id: Finddqm-common.cmake 778185 2016-10-13 08:34:54Z alibrari $
#
# Try to find DQM-COMMON
# Defines:
diff --git a/Build/AtlasCMake/modules/Findtdaq-common.cmake b/Build/AtlasCMake/modules/Findtdaq-common.cmake
index 6d2508a1ffe..5715f5e1fdc 100644
--- a/Build/AtlasCMake/modules/Findtdaq-common.cmake
+++ b/Build/AtlasCMake/modules/Findtdaq-common.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: Findtdaq-common.cmake 778186 2016-10-13 08:35:27Z alibrari $
+# $Id: Findtdaq-common.cmake 778185 2016-10-13 08:34:54Z alibrari $
#
# Try to find TDAQ-COMMON.
# Defines:
diff --git a/Build/AtlasCMake/modules/Findtdaq.cmake b/Build/AtlasCMake/modules/Findtdaq.cmake
index 9784980dc3d..a7e1a540372 100644
--- a/Build/AtlasCMake/modules/Findtdaq.cmake
+++ b/Build/AtlasCMake/modules/Findtdaq.cmake
@@ -1,6 +1,6 @@
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-# $Id: Findtdaq.cmake 778186 2016-10-13 08:35:27Z alibrari $
+# $Id: Findtdaq.cmake 785934 2016-11-23 09:25:16Z elmsheus $
#
# Try to find TDAQ
# Defines:
@@ -59,8 +59,13 @@ remove_definitions( -DHAVE_BOOL -DHAVE_DYNAMIC_CAST -DHAVE_NAMESPACES )
# Add the RPM dependencies:
if( TDAQ_FOUND )
# Set up a dependency on the main tdaq RPM package:
- set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS
- "tdaq-${TDAQ_VERSION}_${ATLAS_PLATFORM}" )
+ if ( TDAQ_PROJECT_NAME )
+ set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS
+ "${TDAQ_PROJECT_NAME}-${TDAQ_VERSION}_${ATLAS_PLATFORM}" )
+ else()
+ set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS
+ "tdaq-${TDAQ_VERSION}_${ATLAS_PLATFORM}" )
+ endif()
# foreach( comp ${tdaq_FIND_COMPONENTS} )
# if( TDAQ_${comp}_FOUND )
--
GitLab