Skip to content
Snippets Groups Projects
Commit f9ba37f3 authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'gcc8.PerfMonEvent-20181002' into 'master'

PerfMonEvent: Suppress gcc8 warning from boost.

See merge request atlas/athena!14654
parents d470619c 04e837a7
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,13 @@ atlas_depends_on_subdirs( PUBLIC ...@@ -13,6 +13,13 @@ atlas_depends_on_subdirs( PUBLIC
find_package( PythonLibs ) find_package( PythonLibs )
find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread ) find_package( ROOT COMPONENTS Core Tree MathCore Hist RIO pthread )
# We don't have a direct dependency on boost from this package, but if we
# pick up the dependency implicitly rather than explicitly, we include
# root headers with -I rather than -isystem.
# That exposes us to a warning found by gcc8 in mpl/assert.h.
# [Fixed in boost 1.68; see https://github.com/boostorg/mpl/issues/31.]
find_package( Boost )
# Component(s) in the package: # Component(s) in the package:
atlas_add_library( PerfMonEvent atlas_add_library( PerfMonEvent
src/PyStore.cxx src/PyStore.cxx
...@@ -21,9 +28,9 @@ atlas_add_library( PerfMonEvent ...@@ -21,9 +28,9 @@ atlas_add_library( PerfMonEvent
src/MemStatsHooks.cxx src/MemStatsHooks.cxx
src/MallocStats.cxx src/MallocStats.cxx
PUBLIC_HEADERS PerfMonEvent PUBLIC_HEADERS PerfMonEvent
INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}
PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS} PRIVATE_INCLUDE_DIRS ${ROOT_INCLUDE_DIRS}
LINK_LIBRARIES ${PYTHON_LIBRARIES} GaudiKernel rt LINK_LIBRARIES ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} GaudiKernel rt
PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} ) PRIVATE_LINK_LIBRARIES ${ROOT_LIBRARIES} )
atlas_add_dictionary( PerfMonEventDict atlas_add_dictionary( PerfMonEventDict
......
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