fixing nightly CMake errors. Details:...

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

graphics/Qat/QatPresenterApp/CMakeLists.txt

@@ -12,6 +12,19 @@ atlas_depends_on_subdirs( PUBLIC
 # External dependencies:
 find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui )
 
+# 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)
+
+# set additional compilation flags
+SET(MY_GCC_COMPILE_FLAGS "-g -O0")
+SET( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${MY_GCC_COMPILE_FLAGS}" )
+
 include_directories( /usr/X11R6/include )
 
 # Remove the --as-needed linker flags:
@@ -21,5 +34,5 @@ atlas_disable_as_needed()
 atlas_add_executable( present
                       src/present.cpp
                       INCLUDE_DIRS ${QT4_INCLUDE_DIRS}
-                      LINK_LIBRARIES ${QT4_LIBRARIES} GL QatPresenter )
+                      LINK_LIBRARIES ${QT4_LIBRARIES} GL QatPresenter)
 

graphics/Qat/QatPresenterApp/cmt/requirements

 package QatPresenterApp
 
 author Joe Boudreau
+manager Riccardo Maria Bianchi
 
 use AtlasPolicy         AtlasPolicy-*
 use VP1Qt               VP1Qt-*                  graphics/VP1

graphics/Qat/QatPresenterApp/qat-project/QatProjectForm.cpp

@@ -67,8 +67,12 @@ void QatProjectForm::createProject() {
   }
   mkdir((directoryName+"/src").c_str(),0755);
   system ((std::string("cp /usr/local/share/templates/qt.pro ") + directoryName+"/src").c_str()); 
-  system (("sed -i  s/\\<app\\>/" + programName + "/g " + directoryName + "/src/qt.pro").c_str());
 
+#ifdef __APPLE__
+  system (("sed -i .orig s/\"<app>\"/" + programName + "/g " + directoryName + "/src/qt.pro").c_str());
+#else
+  system (("sed -i  s/\\<app\\>/" + programName + "/g " + directoryName + "/src/qt.pro").c_str());
+#endif
   // There are eight templates.  Choose one of them:
   if (plotView) {
     if (type==ZeroToZero) system (("cp /usr/local/share/templates/templateZeroToZeroView.cpp " + directoryName + "/src/" + programName + ".cpp").c_str()); 
@@ -93,13 +97,15 @@ void QatProjectForm::createProject() {
 }
 
 void QatProjectForm::editingFinished() {
+  char BUFF[1024];
   if (!ui.programNameLineEdit->text().isEmpty() && ui.directoryLabel->text().isEmpty()) 
-    ui.directoryLabel->setText(QString(get_current_dir_name())+QString("/")+ui.programNameLineEdit->text().toUpper()); 
+    ui.directoryLabel->setText(QString(getcwd(BUFF,1024))+QString("/")+ui.programNameLineEdit->text().toUpper()); 
 }
 
 void QatProjectForm::changeDir() {
+  char BUFF[1024];
   QString fileName = QFileDialog::getSaveFileName(this, tr("Set Project Directory"),
-						  get_current_dir_name(),
+						  getcwd(BUFF,1024),
 						  QString(""),
 						  NULL,
 						  QFileDialog::ShowDirsOnly);

graphics/Qat/QatPresenterApp/qat-project/TEMPLATES/qt.pro

@@ -7,9 +7,13 @@ TARGET = <app>
 DESTDIR = ../local/bin
 DEPENDPATH += .
 INCLUDEPATH += . .. 
-LIBS=-L../local/lib -lQatPlotWidgets -lQatPlotting -lQatDataModeling -lgfortran -lQatDataAnalysis -lCLHEP -lgsl -lgslcblas
+LIBS=-lQatPlotWidgets -lQatPlotting -lQatDataModeling -lgfortran -lQatDataAnalysis -lCLHEP -lgsl -lgslcblas -ldl
 
 CONFIG += qt debug
 
 # Input
 SOURCES += <app>.cpp
+
+mac {
+  CONFIG -= app_bundle
+}

graphics/Qat/QatPresenterApp/qat-project/qt.pro

@@ -18,6 +18,8 @@ target.path=/usr/local/bin
 templates.path  = /usr/local/share/templates
 templates.files = TEMPLATES/*.cpp TEMPLATES/*.pro
 INSTALLS += templates
-
+mac {
+  CONFIG -= app_bundle
+}
 
 

graphics/Qat/QatPresenterApp/src/QatPresenterApp.pro

@@ -16,3 +16,6 @@ target.path=/usr/local/bin
 
 INSTALLS += target
 
+mac {
+  CONFIG -= app_bundle
+}