Fixes to VP1 CMakeLists and update the VP1 directories to try to compile

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

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:

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 )

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 )

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 )

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 )

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 )