Skip to content

Commit

Permalink
Tests execute in Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
markummitchell-tu committed Oct 27, 2015
1 parent 33515e5 commit 213b340
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ engauge_test.log*
engauge_test.pro
engauge_test.pro.user
Makefile*
object_script.engauge
object_script.*
qrc_*
3 changes: 3 additions & 0 deletions src/build_and_run_all_tests
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ tests=(TestCorrelation TestFormats TestGraphCoords TestProjectedPoint TestSpline

echo "Available tests: " ${tests[*]}

# Need gcc 4 at /C/cygwin/bin rather than gcc 3 at /usr/bin to prevent 'unrecognized command line
# option -fno-keep-inline-dllexport'
PATH=/C/QtOpenSource/Qt5.5.1/Tools/mingw492_32/bin:$PATH
argcount="$#"

if [ $argcount -gt 0 ]
Expand Down
10 changes: 10 additions & 0 deletions src/engauge_test_template.pro
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,11 @@ TARGET = ../bin/TEST

QT += core gui network printsupport testlib widgets xml help

win32-g++* {
CONFIG += windows
LIBS += -L$$(LOG4CPP_HOME)/lib -L$$(FFTW_HOME)/lib
}

LIBS += -llog4cpp -lfftw3
INCLUDEPATH += Background \
Callback \
Expand Down Expand Up @@ -525,6 +530,11 @@ INCLUDEPATH += Background \
util \
View

win32-g++* {
INCLUDEPATH += $$(FFTW_HOME)/include \
$$(LOG4CPP_HOME)/include
}

RESOURCES += \
engauge.qrc

Expand Down

0 comments on commit 213b340

Please sign in to comment.