Commit 2ab40374 authored by Johnny Jazeix's avatar Johnny Jazeix

Fix compilation bug with configure script (missing link to colorpicker). If a...

Fix compilation bug with configure script (missing link to colorpicker). If a parser is unavailable a understandable warning appears.
parent 2b62dff8
......@@ -227,12 +227,7 @@ bool Core::draw_trace(const string & filename, const int format) {
int time_buf = 0;
// Select the Parser in function of the file's extension
bool parser_recognised = ParserFactory::create(&parser, filename);
if (!parser_recognised) {
// Set to ParserPaje * by default
Error::set(Error::_BAD_FILE_EXTENSION, Error::_WARNING);
}
ParserFactory::create(&parser, filename);
// Set application in working state
QApplication::setOverrideCursor(Qt::WaitCursor);
......
......@@ -51,7 +51,7 @@
#include <QInputDialog>
#include <QMessageBox>
/* -- */
#include "general/qtcolorpicker/src/qtcolorpicker.h"
#include "qtcolorpicker/src/qtcolorpicker.h"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityValue.hpp"
......
......@@ -45,16 +45,20 @@
#include <list>
#include <map>
#include <fstream>
#include <sstream>
/* -- */
#include "trace/values/Values.hpp"
#include "trace/EntityTypes.hpp"
#include "trace/Entitys.hpp"
#include "trace/Trace.hpp"
/* -- */
#include "common/Message.hpp"
/* -- */
#include "parser/Parser.hpp"
#include "parser/ParserPaje.hpp"
//#include "parser/ParserVite.hpp"
#ifdef DEADCODE
#include "parser/ParserVite.hpp"
#endif // DEADCODE
#ifdef WITH_OTF
#include <otf.h>
#include "parser/ParserOTF.hpp"
......@@ -86,16 +90,20 @@ bool ParserFactory::create(Parser **parser,
*parser = new ParserVite(filename);
}
#endif
#ifdef WITH_OTF
else if(ext == ".otf") {
#ifdef WITH_OTF
*parser = new ParserOTF(filename);
}
#else
*Message::get_instance() << "OTF parser was not compiled. Use parser Paje by default" << Message::endw;
#endif //WITH_OTF
#ifdef WITH_TAU
}
else if( (ext == ".trc") || (ext == ".edf") ) {
#ifdef WITH_TAU
*parser = new ParserTau(filename);
}
#else
*Message::get_instance() << "Tau parser was not compiled. Use parser Paje by default" << Message::endw;
#endif //WITH_TAU
}
}
if(*parser == NULL) {
......
......@@ -52,8 +52,8 @@ TEMPLATE = app
TARGET = vite
#macx:QMAKE_LIBS_OPENGL += -framework GLUT -lobjc
macx:QMAKE_LIBS_OPENGL += -framework -lobjc
DEPENDPATH += . common interface parser trace trace/values trace/tree info render statistics
INCLUDEPATH += .
DEPENDPATH += . common interface parser trace trace/values trace/tree info render statistics ../../externals ../../../externals
INCLUDEPATH += . ../../externals ../../../externals
QMAKE_CFLAGS += -O2 -fPIC -Wall
QMAKE_CXXFLAGS += -O2 -fPIC -Wall
......@@ -78,7 +78,6 @@ HEADERS += common/common.hpp \
interface/Settings_window.hpp \
interface/Interface_graphic.hpp \
interface/resource.hpp \
general/qtcolorpicker/src/qtcolorpicker.h \
# Core header
core/Core.hpp \
# Render headers
......@@ -145,7 +144,9 @@ HEADERS += common/common.hpp \
# Plugin header
plugin/Command_window.hpp \
plugin/Plugin_window.hpp \
plugin/Plugin.hpp
plugin/Plugin.hpp \
# External header
qtcolorpicker/src/qtcolorpicker.h
FORMS += interface/info_window.ui interface/main_window.ui interface/option_export_window.ui interface/settings.ui interface/stats_viewer.ui interface/global_cmd.ui list_of_counter_to_export.ui
......@@ -209,13 +210,14 @@ SOURCES += common/Message.cpp \
# interface/help.cpp \
interface/Settings_window.cpp \
interface/interface_graphic.cpp \
general/qtcolorpicker/src/qtcolorpicker.cpp \
# Core code file
core/Core.cpp \
# Plugin code file
plugin/Command_window.cpp \
plugin/Plugin_window.cpp \
plugin/Plugin.cpp \
# External code file
qtcolorpicker/src/qtcolorpicker.cpp \
# Main code file
main.cpp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment