From 6eb6c175e0c1485023fadc3dc6805a2c1ff90e33 Mon Sep 17 00:00:00 2001
From: Edward Moyse <edward.moyse@cern.ch>
Date: Fri, 15 Sep 2017 11:11:39 +0200
Subject: [PATCH] Fixes to VP1 CMakeLists and update the VP1 directories to try
 to compile

---
 Projects/Athena/package_filters.txt           | 22 ++++++-------------
 .../VP1Systems/VP1CaloSystems/CMakeLists.txt  |  2 +-
 .../VP1MissingEtSystems/CMakeLists.txt        |  4 +---
 .../VP1RawDataSystems/CMakeLists.txt          |  2 +-
 .../VP1Systems/VP1TestSystems/CMakeLists.txt  |  2 +-
 .../VP1TrackingGeometrySystems/CMakeLists.txt |  2 +-
 .../VP1VertexSystems/CMakeLists.txt           |  2 +-
 7 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/Projects/Athena/package_filters.txt b/Projects/Athena/package_filters.txt
index 4c20de1b25d..e4559fab2e5 100644
--- a/Projects/Athena/package_filters.txt
+++ b/Projects/Athena/package_filters.txt
@@ -20,21 +20,13 @@
 - Generators/Herwigpp_i
 
 # Temporary VP1 compilation issues
-+ graphics/VP1/VP1HEPVis
-+ graphics/VP1/VP1Base
-+ graphics/VP1/VP1UtilsBase
-+ graphics/VP1/VP1Gui
-+ graphics/VP1/VP1Algs
-+ graphics/VP1/VP1Utils
-+ graphics/VP1/VP1Systems/VP1AODSystems
-+ graphics/VP1/VP1Plugins/VP1AODPlugin
-+ graphics/VP1/VP1Systems/VP1GeometrySystems
-+ graphics/VP1/VP1Plugins/VP1GeometryPlugin
-+ graphics/VP1/VP1Systems/VP1GuideLineSystems
-+ graphics/VP1/VP1Systems/VP1SimHitSystems
-# + graphics/VP1/VP1Plugins/VP1TrackPlugin
-# + graphics/VP1/VP1Systems/VP1TrackSystems
-- graphics/VP1/.*
+- graphics/VP1/VP1Systems/VP1UtilitySystems
+- graphics/VP1/VP1Systems/VP1TriggerSystems
+- graphics/VP1/VP1Systems/VP12DGeometrySystems
+- graphics/VP1/VP1Systems/VP1MCSystems
+- graphics/VP1/VP1Systems/VP1CaloSystems 
+- graphics/VP1/VP1Systems/VP1TriggerDecisionSystems
++ graphics/VP1/.*
 
 # Some analysis packages that are not part of Athena
 - Control/AthLinksSA
diff --git a/graphics/VP1/VP1Systems/VP1CaloSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1CaloSystems/CMakeLists.txt
index b5dae4dc219..41eb4a0ab4c 100644
--- a/graphics/VP1/VP1Systems/VP1CaloSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1CaloSystems/CMakeLists.txt
@@ -33,7 +33,7 @@ atlas_depends_on_subdirs(
 # External dependencies:
 find_package( CLHEP )
 find_package( Coin3D )
-find_package( Qt5 COMPONENTS Core Gui  )
+find_package( Qt5 COMPONENTS Core Gui Widgets )
 find_package( Qwt )
 
 # Generate UI files automatically:
diff --git a/graphics/VP1/VP1Systems/VP1MissingEtSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1MissingEtSystems/CMakeLists.txt
index 671aaf7c718..686d86c0eba 100644
--- a/graphics/VP1/VP1Systems/VP1MissingEtSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1MissingEtSystems/CMakeLists.txt
@@ -15,9 +15,7 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( CLHEP )
 find_package( Coin3D )
-
-
-
+find_package( Qt5 COMPONENTS Core Gui Widgets )
 
 # Generate UI files automatically:
 set( CMAKE_AUTOUIC TRUE )
diff --git a/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt
index 828ae792443..fa5f972f94b 100644
--- a/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1RawDataSystems/CMakeLists.txt
@@ -24,7 +24,7 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( Coin3D )
 find_package( Eigen )
-
+find_package( Qt5 COMPONENTS Core Gui Widgets )
 
 # Generate UI files automatically:
 set( CMAKE_AUTOUIC TRUE )
diff --git a/graphics/VP1/VP1Systems/VP1TestSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1TestSystems/CMakeLists.txt
index 351ee00b7d2..8e29e65aa96 100644
--- a/graphics/VP1/VP1Systems/VP1TestSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1TestSystems/CMakeLists.txt
@@ -20,7 +20,7 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( Coin3D )
 find_package( Eigen )
-find_package( Qt5 COMPONENTS Core Gui  )
+find_package( Qt5 COMPONENTS Core Gui Widgets )
 
 # Generate UI files automatically:
 set( CMAKE_AUTOUIC TRUE )
diff --git a/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/CMakeLists.txt
index 3ed9b09c6f1..72b1e98ca49 100644
--- a/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1TrackingGeometrySystems/CMakeLists.txt
@@ -23,7 +23,7 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( Coin3D )
 find_package( Eigen )
-find_package( Qt5 COMPONENTS Core Gui  )
+find_package( Qt5 COMPONENTS Core Gui Widgets )
 
 # Generate UI files automatically:
 set( CMAKE_AUTOUIC TRUE )
diff --git a/graphics/VP1/VP1Systems/VP1VertexSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1VertexSystems/CMakeLists.txt
index 93b24ed8ade..a56ba86f354 100644
--- a/graphics/VP1/VP1Systems/VP1VertexSystems/CMakeLists.txt
+++ b/graphics/VP1/VP1Systems/VP1VertexSystems/CMakeLists.txt
@@ -22,7 +22,7 @@ atlas_depends_on_subdirs( PUBLIC
 find_package( Coin3D )
 find_package( Eigen )
 find_package( HepMC )
-find_package( Qt5 COMPONENTS Core Gui  )
+find_package( Qt5 COMPONENTS Core Gui Widgets )
 
 # Generate UI files automatically:
 set( CMAKE_AUTOUIC TRUE )
-- 
GitLab