Skip to content

Commit

Permalink
Added custom.pro which is included from VisceralFatValidation.pro
Browse files Browse the repository at this point in the history
Added custom.pro to .gitignore

The purpose of the custom.pro is to contain any configuration values in
the pro file that are dependent on the user and should not be tracked in
GitHub. The most obvious is the external libraries because the path can
vary from person to person.
  • Loading branch information
addisonElliott committed Jan 24, 2017
1 parent 550ebd5 commit 39d66fc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 32 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*.pro.user.*
*.qbs.user
*.qbs.user.*
custom.pro
*.moc
moc_*.cpp
qrc_*.cpp
Expand Down
35 changes: 3 additions & 32 deletions VisceralFatValidation.pro
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ TEMPLATE = app
CONFIG(release, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT QT_MESSAGELOGCONTEXT

SOURCES += main.cpp\
mainwindow.cpp \
mainwindow.cpp \
util.cpp \
vertex.cpp \
niftimage.cpp \
Expand Down Expand Up @@ -55,36 +55,7 @@ FORMS += mainwindow.ui \
view_axialcoronalhires.ui \
view_axialcoronallores.ui

DISTFILES +=

# Include the NIFTI files and link the dynamic libraries.
# The DLL files should deploy with the application automatically
INCLUDEPATH += 'D:/DevelLibs/nifticlib-2.0.0/build/include'
DEPENDPATH += 'D:/DevelLibs/nifticlib-2.0.0/build/include'

LIBS += -LD:/DevelLibs/nifticlib-2.0.0/build/lib \
-lnifticdf \
-lniftiio \
-lznz

LIBS += -LD:/DevelLibs/zlib-1.2.8/build/lib \
-lzlib

INCLUDEPATH += 'D:/DevelLibs/opencv/build/install/include'
DEPENDPATH += 'D:/DevelLibs/opencv/build/install/include'
CONFIG(debug, debug|release): LIBS += -LD:/DevelLibs/opencv/build/lib/Debug \
-lopencv_core310d \
-lopencv_imgproc310d \
-lopencv_highgui310d \
-lopencv_ml310d \
-lopencv_video310d

CONFIG(release, debug|release): LIBS += -LD:/DevelLibs/opencv/build/lib/Release \
-lopencv_core310 \
-lopencv_imgproc310 \
-lopencv_highgui310 \
-lopencv_ml310 \
-lopencv_video310

RESOURCES += \
resources.qrc

exists(custom.pro): include(custom.pro)

0 comments on commit 39d66fc

Please sign in to comment.