From fc8c998a009b1411c10afbd87ee93fc0965e17c3 Mon Sep 17 00:00:00 2001 From: Riccardo Maria Bianchi <riccardo.maria.bianchi@cern.ch> Date: Wed, 27 Apr 2016 15:09:04 +0200 Subject: [PATCH] fixing nightly CMake errors. Details: https://its.cern.ch/jira/browse/ATLASVPONE-313 (VP1MCSystems-00-00-05) * fixing CMake errors details: https://its.cern.ch/jira/browse/ATLASVPONE-313 * tag: VP1MCSystems-00-00-05 --- .../VP1/VP1Systems/VP1MCSystems/CMakeLists.txt | 14 ++++++++++++-- .../VP1/VP1Systems/VP1MCSystems/cmt/requirements | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/graphics/VP1/VP1Systems/VP1MCSystems/CMakeLists.txt b/graphics/VP1/VP1Systems/VP1MCSystems/CMakeLists.txt index 94f43cfbc22..701caa37523 100644 --- a/graphics/VP1/VP1Systems/VP1MCSystems/CMakeLists.txt +++ b/graphics/VP1/VP1Systems/VP1MCSystems/CMakeLists.txt @@ -19,10 +19,20 @@ atlas_depends_on_subdirs( PUBLIC find_package( CLHEP ) find_package( HepMC ) find_package( HepPDT ) +find_package( Qt4 ) + +# Generate UI files automatically: +set( CMAKE_AUTOUIC TRUE ) +# Generate MOC files automatically: +set( CMAKE_AUTOMOC TRUE ) +# Generate resource files automatically: +set( CMAKE_AUTORCC TRUE ) +# to let CMake find .h files automatically-generated from .ui files +set(CMAKE_INCLUDE_CURRENT_DIR ON) + # Component(s) in the package: -atlas_add_library( VP1MCSystems - src/*.c* +atlas_add_library( VP1MCSystems VP1MCSystems/*.h src/*.h src/*.cxx src/*.qrc PUBLIC_HEADERS VP1MCSystems PRIVATE_INCLUDE_DIRS ${HEPPDT_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} PRIVATE_DEFINITIONS ${CLHEP_DEFINITIONS} diff --git a/graphics/VP1/VP1Systems/VP1MCSystems/cmt/requirements b/graphics/VP1/VP1Systems/VP1MCSystems/cmt/requirements index b0d1a89f843..93f2649c880 100755 --- a/graphics/VP1/VP1Systems/VP1MCSystems/cmt/requirements +++ b/graphics/VP1/VP1Systems/VP1MCSystems/cmt/requirements @@ -2,6 +2,7 @@ package VP1MCSystems author Joe Boudreau <Joseph.Boudreau@cern.ch> manager Joe Boudreau <Joseph.Boudreau@cern.ch> +manager Riccardo Maria BIANCHI <rbianchi@cern.ch> use AtlasPolicy AtlasPolicy-* use VP1Base VP1Base-* graphics/VP1 -- GitLab