From 340ff2bc2cfe3cce88ce7fd695066b72f329e33e Mon Sep 17 00:00:00 2001
From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch>
Date: Tue, 26 Apr 2016 16:33:02 +0200
Subject: [PATCH] fixing nightly error about Qt and Boost while MOC compiling.
Details: https://its.cern.ch/jira/browse/ATLASRECTS-3097
(VP1TriggerSystems-00-00-12)
* fixing nightly error about Qt and Boost while MOC compiling. Details:
https://its.cern.ch/jira/browse/ATLASRECTS-3097
* Tagging VP1TriggerSystems-00-00-12
2016-02-10 scott snyder <snyder@bnl.gov>
* Tagging VP1TriggerSystems-00-00-11.
* src/VP1TriggerHandleEF.cxx (loadTrackContainer): Const fix.
2015-02-03 Riccardo.Maria.Bianchi@cern.ch
* added a workaround for a Qt-BOOST bug.
Details here: https://its.cern.ch/jira/browse/ATLASVPONE-184
---
.../VP1TriggerSystems/CMakeLists.txt | 55 +++++++++++++++++++
.../VP1TriggerSystems/VP1TriggerUISystem.h | 2 +
.../VP1TriggerSystems/cmt/requirements | 1 +
.../src/TrackSystemDisplay.cxx | 2 +-
.../src/VP1TriggerHandleEF.cxx | 2 +-
.../src/VP1TriggerUISystem.cxx | 1 +
6 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 graphics/VP1/VP1Systems/VP1TriggerSystems/CMakeLists.txt
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1TriggerSystems/CMakeLists.txt
new file mode 100644
index 00000000000..b44a9024b98
--- /dev/null
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/CMakeLists.txt
@@ -0,0 +1,55 @@
+################################################################################
+# Package: VP1TriggerSystems
+################################################################################
+
+# Declare the package name:
+atlas_subdir( VP1TriggerSystems )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+ Control/StoreGate
+ PhysicsAnalysis/AnalysisTrigger/AnalysisTriggerEvent
+ Trigger/TrigAnalysis/TrigDecisionTool
+ Trigger/TrigAnalysis/TrigObjectMatching
+ Trigger/TrigEvent/TrigMuonEvent
+ Trigger/TrigEvent/TrigSteeringEvent
+ graphics/VP1/VP1Base
+ PRIVATE
+ DetectorDescription/GeoPrimitives
+ GaudiKernel
+ Tracking/TrkEvent/TrkParameters
+ Tracking/TrkEvent/TrkTrack )
+
+# External dependencies:
+find_package( Coin3D )
+find_package( Eigen )
+find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui )
+
+include_directories( /usr/X11R6/include )
+
+# Generate UI files automatically:
+set( CMAKE_AUTOUIC TRUE )
+# Generate MOC files automatically:
+set( CMAKE_AUTOMOC TRUE )
+set( CMAKE_AUTOMOC_MOC_OPTIONS "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED")
+# ### NOTE! ###
+# "-DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED" is needed when using Qt < 5.0 together with BOOST > 1.52.
+# Details:
+# - https://its.cern.ch/jira/browse/ATLASRECTS-3097
+# - https://its.cern.ch/jira/browse/ATLASVPONE-184
+
+
+# Generate resource files automatically:
+set( CMAKE_AUTORCC TRUE )
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+
+# Component(s) in the package:
+atlas_add_library( VP1TriggerSystems VP1TriggerSystems/*.h src/*.h src/*.cxx src/*.qrc
+ PUBLIC_HEADERS VP1TriggerSystems
+ INCLUDE_DIRS ${QT4_INCLUDE_DIRS}
+ PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}
+ LINK_LIBRARIES AnalysisTriggerEvent TrigMuonEvent TrigSteeringEvent VP1Base ${QT4_LIBRARIES} GL StoreGateLib SGtests TrigDecisionToolLib TrigObjectMatchingLib
+ PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} ${EIGEN_LIBRARIES} GeoPrimitives GaudiKernel TrkParameters TrkTrack
+ )
+
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerUISystem.h b/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerUISystem.h
index c0f6cee21d3..cd4e968883d 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerUISystem.h
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/VP1TriggerSystems/VP1TriggerUISystem.h
@@ -2,6 +2,7 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
+
#ifndef VP1TRIGGERUISYSTEM_H
#define VP1TRIGGERUISYSTEM_H
@@ -44,3 +45,4 @@ public:
VP1Trig::VP1TriggerTool * m_triggertool;
};
#endif
+
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements
index 4bba8e094bc..a091e22323d 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/cmt/requirements
@@ -2,6 +2,7 @@ package VP1TriggerSystems
author Manuel Proissl <mproissl@cern.ch>
manager Manuel Proissl <mproissl@cern.ch>
+manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
public
use AtlasPolicy AtlasPolicy-*
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/TrackSystemDisplay.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/TrackSystemDisplay.cxx
index 2e87b9b9797..ab448ba8f26 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/TrackSystemDisplay.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/TrackSystemDisplay.cxx
@@ -17,7 +17,7 @@
#include "ui_tracksystemcontrollerform.h"
//Track includes
-#include "StoreGate/StoreGate.h"
+#include "StoreGate/StoreGateSvc.h"
#include "TrkTrack/Track.h"
#include "TrkTrack/TrackCollection.h"
#include "TrkParameters/TrackParameters.h"
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
index d3ce2572eb2..33e501e8e99 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerHandleEF.cxx
@@ -154,7 +154,7 @@ bool VP1Trig::VP1TriggerHandleEF::loadTrackContainer()
count_mg=0;
if(m_containerEF->hasTrack()) { //Muon in RoI
- TrigMuonEFInfoTrackContainer *tc = m_containerEF->TrackContainer(); //TrackContainer: more than one muon in RoI
+ const TrigMuonEFInfoTrackContainer *tc = m_containerEF->TrackContainer(); //TrackContainer: more than one muon in RoI
TrigMuonEFInfoTrackContainer::const_iterator TrackItr;
for(TrackItr = tc->begin(); TrackItr!=tc->end(); TrackItr++) {
diff --git a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerUISystem.cxx b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerUISystem.cxx
index 7812d1bacdd..16adb03233c 100644
--- a/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerUISystem.cxx
+++ b/graphics/VP1/VP1Systems/VP1TriggerSystems/src/VP1TriggerUISystem.cxx
@@ -11,6 +11,7 @@
* @author : Manuel Proissl <mproissl@cern.ch> - University of Edinburgh
***********************************************************************************/
+
//Local includes
#include "VP1TriggerSystems/VP1TriggerUISystem.h"
#include "VP1TriggerSystems/VP1TriggerTool.h"
--
GitLab