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

small fixes for MAC

Browse Source
This commit is contained in:
Matthias Jung
2016-05-04 11:32:28 +02:00
parent a02dd8350a
commit 4edb3978fe
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,12 @@ PythonCaller::PythonCaller() :
testFunctionName("runTests"),
metricModuleName("metrics"),
metricFunctionName("calculateMetrics"),
#ifdef MAC
pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../../../../DRAMSys/analyzer/scripts/"),
#else
pathToScripts(QApplication::applicationDirPath().toStdString() + "/../../DRAMSys/analyzer/scripts/"),
#endif
plotsModuleName("plots"),
plotsFunctionName("generatePlots")
{

6
DRAMSys/analyzer/traceAnalyzer.pro
View File

@@ -15,11 +15,13 @@ unix:!macx {
QMAKE_CXXFLAGS += -std=c++11
CONFIG += qwt
QMAKE_CXXFLAGS += -Xlinker -export-dynamic
QMAKE_RPATHDIR += $${libqwt_home}
message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
}
macx: {
CONFIG += c++11
QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++
QMAKE_CXXFLAGS += -std=c++0x -stdlib=libc++ -DMAC
QMAKE_LFLAGS += -F/opt/qwt-6.1.2/lib
LIBS += -F/opt/qwt-6.1.2/lib/ -framework qwt
INCLUDEPATH += /opt/qwt-6.1.2/lib/qwt.framework/Headers
@@ -35,8 +37,6 @@ isEmpty(libqwt_home) {
}
message(LIBQWT path is $${libqwt_home})
QMAKE_RPATHDIR += $${libqwt_home}
message(Linker options QMAKE_RPATHDIR is $${QMAKE_RPATHDIR})
libqwt_headers = $$(LIBQWT_HEADERS)
isEmpty(libqwt_headers) {