Skip to content
Snippets Groups Projects
Commit b30937ae authored by Riccardo Maria Bianchi's avatar Riccardo Maria Bianchi :sunny: Committed by Graeme Stewart
Browse files

fixing nightly CMake errors. Details:...

fixing nightly CMake errors. Details: https://its.cern.ch/jira/browse/ATLASRECTS-3097 (QatPlotWidgets-00-00-10)


Former-commit-id: 7917d296
parent af45b9f7
No related merge requests found
...@@ -11,7 +11,17 @@ atlas_depends_on_subdirs( PUBLIC ...@@ -11,7 +11,17 @@ atlas_depends_on_subdirs( PUBLIC
# External dependencies: # External dependencies:
find_package( CLHEP ) find_package( CLHEP )
find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui ) find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui QtSvg )
# 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)
include_directories( /usr/X11R6/include ) include_directories( /usr/X11R6/include )
...@@ -19,8 +29,7 @@ include_directories( /usr/X11R6/include ) ...@@ -19,8 +29,7 @@ include_directories( /usr/X11R6/include )
atlas_disable_as_needed() atlas_disable_as_needed()
# Component(s) in the package: # Component(s) in the package:
atlas_add_library( QatPlotWidgets atlas_add_library( QatPlotWidgets QatPlotWidgets/*.h src/*.h src/*.c* src/*.qrc
src/*.c*
PUBLIC_HEADERS QatPlotWidgets PUBLIC_HEADERS QatPlotWidgets
INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${QT4_INCLUDE_DIRS} INCLUDE_DIRS ${CLHEP_INCLUDE_DIRS} ${QT4_INCLUDE_DIRS}
DEFINITIONS ${CLHEP_DEFINITIONS} DEFINITIONS ${CLHEP_DEFINITIONS}
......
...@@ -2,6 +2,7 @@ package QatPlotWidgets ...@@ -2,6 +2,7 @@ package QatPlotWidgets
author Joe Boudreau author Joe Boudreau
author Vakho Tsulaia author Vakho Tsulaia
manager Riccardo Maria Bianchi
use AtlasPolicy AtlasPolicy-* use AtlasPolicy AtlasPolicy-*
use VP1Qt VP1Qt-* graphics/VP1 use VP1Qt VP1Qt-* graphics/VP1
......
...@@ -864,7 +864,7 @@ void PlotView::resizeEvent (QResizeEvent *event) { ...@@ -864,7 +864,7 @@ void PlotView::resizeEvent (QResizeEvent *event) {
// This is here to prevent funny sizes appearing during resize: // This is here to prevent funny sizes appearing during resize:
create(); create();
QSize size=event->size(); //QSize size=event->size(); // size not used anymore...
//int h=size.height(); //int h=size.height();
//int w=size.width(); //int w=size.width();
......
...@@ -11,7 +11,7 @@ DESTDIR=../../../lib ...@@ -11,7 +11,7 @@ DESTDIR=../../../lib
FORMS=LabelEditorDialog.ui PVControl.ui PlotDirDialog.ui ParameterDialog.ui FORMS=LabelEditorDialog.ui PVControl.ui PlotDirDialog.ui ParameterDialog.ui
CONFIG += qt debug CONFIG += qt debug
QT += svg QT += svg
LIBS = -lQatPlotting -lQatDataModeling -lQatDataAnalysis -lCLHEP
# Input # Input
HEADERS += ../QatPlotWidgets/CustomRangeDivider.h \ HEADERS += ../QatPlotWidgets/CustomRangeDivider.h \
../QatPlotWidgets/RangeDivision.h \ ../QatPlotWidgets/RangeDivision.h \
......
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