derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAC compile flag removed.

Browse Source 
By using the CONFIG-=app_bundle the trace analyzer
wont be build as a app package on mac anymore.
It behaves exactly like on linux now.
This commit is contained in:
Matthias Jung
2016-10-24 18:04:28 +02:00
parent 5a5e170e77
commit c0fd9de60f
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DRAMSys/analyzer/businessObjects/pythoncaller.cpp
View File

@@ -53,11 +53,7 @@ PythonCaller::PythonCaller() :
metricFunctionName("calculateMetrics"),
getMetricFunctionName("getMetrics"),
#ifdef MAC
pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../../../../DRAMSys/analyzer/scripts/"),
#else
pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../DRAMSys/analyzer/scripts/"),
#endif
plotsModuleName("plots"),
plotsFunctionName("generatePlots")
{
@@ -67,10 +63,10 @@ PythonCaller::PythonCaller() :
PyList_Insert(sysPath, 0, path);
Py_DECREF(path);
qDebug() << testModuleName.c_str() << testFunctionName.c_str();
qDebug() << metricModuleName.c_str() << metricFunctionName.c_str();
qDebug() << plotsModuleName.c_str() << plotsFunctionName.c_str();
qDebug() << "XXX: " << pathToScripts.c_str();
qDebug() << "Test:" << testModuleName.c_str() << testFunctionName.c_str();
qDebug() << "Metric:" << metricModuleName.c_str() << metricFunctionName.c_str();
qDebug() << "Plot:" << plotsModuleName.c_str() << plotsFunctionName.c_str();
qDebug() << "Script: " << pathToScripts.c_str();
pRunTestsFunction = loadFunctionFromModule(testModuleName, testFunctionName);
pCalculateMetricsFunction = loadFunctionFromModule(metricModuleName, metricFunctionName);

3
DRAMSys/analyzer/traceAnalyzer.pro
View File

@@ -21,13 +21,14 @@ unix:!macx {
macx: {
CONFIG += c++11
QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -DMAC
QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++
QMAKE_LFLAGS += -F$$(LIBQWT_HOME)
LIBS += -F$$(LIBQWT_HOME) -framework qwt
INCLUDEPATH += $$(LIBQWT_HEADERS)
DEPENDPATH += $$replace(LIBQWT_HOME, lib, )
INCLUDEPATH += $$(PYTHON_HEADERS)
LIBS += -L$$(PYTHON_HOME) -lpython3.5
CONFIG-=app_bundle
}
# QWT library and header files