Commit 64072474 authored by Marco Cattaneo's avatar Marco Cattaneo
Browse files

Merge branch 'suppress-nodiscard-run2' into 'run2-patches'

Extend the unknown-attributes warning workaround to ROOT 6.24

See merge request !958
parents 01578ea7 b2e0a2db
Pipeline #2753412 passed with stage
in 38 seconds
###############################################################################
# (c) Copyright 2000-2019 CERN for the benefit of the LHCb Collaboration #
# (c) Copyright 2000-2021 CERN for the benefit of the LHCb Collaboration #
# #
# This software is distributed under the terms of the GNU General Public #
# Licence version 3 (GPL Version 3), copied verbatim in the file "COPYING". #
......@@ -17,7 +17,7 @@ find_package(GaudiProject)
# Workaround for rootcling not knowing what __nodiscard__ is
find_package(ROOT)
if(ROOT_VERSION MATCHES "^6\\.22.*")
if(ROOT_VERSION MATCHES "^6\\.2[2-4].*")
set(PHYS_DICT_GEN_DEFAULT_OPTS -Wno-unknown-attributes)
message(STATUS "Generating dictionaries with additional flags: " ${PHYS_DICT_GEN_DEFAULT_OPTS})
endif()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment