Skip to content
Snippets Groups Projects
Commit 37d244ad authored by Johannes Elmsheuser's avatar Johannes Elmsheuser Committed by Graeme Stewart
Browse files

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
parent e74d06d1
No related branches found
No related tags found
No related merge requests found
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # 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 # 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 # used in an ATLAS build in one place. It is included by default when using
...@@ -100,6 +100,7 @@ if( CMAKE_COMPILER_IS_GNUCXX ) ...@@ -100,6 +100,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
_add_flag( CMAKE_CXX_FLAGS_${mode} "-Wextra" ) _add_flag( CMAKE_CXX_FLAGS_${mode} "-Wextra" )
_add_flag( CMAKE_CXX_FLAGS_${mode} "-Werror=return-type" ) _add_flag( CMAKE_CXX_FLAGS_${mode} "-Werror=return-type" )
endforeach() endforeach()
_add_flag( CMAKE_CXX_FLAGS_DEBUG "-fsanitize=undefined" )
endif() endif()
foreach( mode RELEASE RELWITHDEBINFO DEBUG ) foreach( mode RELEASE RELWITHDEBINFO DEBUG )
_add_flag( CMAKE_CXX_FLAGS_${mode} "-pedantic" ) _add_flag( CMAKE_CXX_FLAGS_${mode} "-pedantic" )
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # 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 # Try to find DQM-COMMON
# Defines: # Defines:
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # 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. # Try to find TDAQ-COMMON.
# Defines: # Defines:
......
# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration # 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 # Try to find TDAQ
# Defines: # Defines:
...@@ -59,8 +59,13 @@ remove_definitions( -DHAVE_BOOL -DHAVE_DYNAMIC_CAST -DHAVE_NAMESPACES ) ...@@ -59,8 +59,13 @@ remove_definitions( -DHAVE_BOOL -DHAVE_DYNAMIC_CAST -DHAVE_NAMESPACES )
# Add the RPM dependencies: # Add the RPM dependencies:
if( TDAQ_FOUND ) if( TDAQ_FOUND )
# Set up a dependency on the main tdaq RPM package: # Set up a dependency on the main tdaq RPM package:
set_property( GLOBAL APPEND PROPERTY ATLAS_EXTERNAL_RPMS if ( TDAQ_PROJECT_NAME )
"tdaq-${TDAQ_VERSION}_${ATLAS_PLATFORM}" ) 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} ) # foreach( comp ${tdaq_FIND_COMPONENTS} )
# if( TDAQ_${comp}_FOUND ) # if( TDAQ_${comp}_FOUND )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment