diff --git a/CMakeLists.txt b/CMakeLists.txt index 39f263c..4e01069 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.8) +cmake_minimum_required(VERSION 3.8.8) project(bullock) @@ -29,10 +29,7 @@ if(NOT MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") endif() - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - # forces colored output when using ninja - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color") - endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color") endif() if(APPLE) diff --git a/Makefile b/Makefile index 64e9ba7..e5dcfe4 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,9 @@ test: run: install ./dist/current/bin/bullock +gdb: install + gdb --args ./dist/current/bin/bullock + devenv-image: docker build . -t ${DEVENV_IMAGE} devenv-create: diff --git a/src/processdata.cpp b/src/processdata.cpp index 8362108..d35da51 100644 --- a/src/processdata.cpp +++ b/src/processdata.cpp @@ -35,6 +35,8 @@ Frame::Frame(QJsonObject frame) { TraceEvent::TraceEvent(QJsonObject tp) { this->channel = tp["channel"].toString(); this->logMsg = tp["log_msg"].toString(); + this->_file = tp["file"].toString(); + this->_line = tp["line"].toInt(); auto frames = tp["frames"].toArray(); for (auto frame : frames) { this->frames.push_back(frame.toObject()); @@ -42,10 +44,10 @@ TraceEvent::TraceEvent(QJsonObject tp) { } QString TraceEvent::file() const { - return this->frames[0].file; + return this->_file; } int TraceEvent::line() const { - return this->frames[0].line; + return this->_line; } diff --git a/src/processdata.hpp b/src/processdata.hpp index 2fdcf09..3b52125 100644 --- a/src/processdata.hpp +++ b/src/processdata.hpp @@ -38,6 +38,8 @@ struct TraceEvent { QString channel; QString logMsg; QVector frames; + QString _file; + int _line; TraceEvent(QJsonObject tp = {});