Skip to content

Commit

Permalink
Use OUT_PWD instead of PWD when referring to position of Ripes library
Browse files Browse the repository at this point in the history
  • Loading branch information
mortbopet committed Sep 3, 2019
1 parent 8621c95 commit d3ac2c2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions app/app.pro
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ SOURCES += main.cpp
# Add RipesLib as a static library and as a PRE_TARGETDEPS.
# PRE_TARGETDEPS ensures that this application is relinked every time the
# target dependency is modified.
win32:CONFIG(release, debug|release): LIBS += -L$${PWD}/../src/release/ -lRipesLib
else:win32:CONFIG(debug, debug|release): LIBS += -L$${PWD}/../src/debug/ -lRipesLib
else:unix: LIBS += -L$${PWD}/../src/ -lRipesLib
win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../src/release/ -lRipesLib
else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../src/debug/ -lRipesLib
else:unix: LIBS += -L$${OUT_PWD}/../src/ -lRipesLib

win32 {
# if cross compiling with MXE on unix, windows libraries will still be
Expand All @@ -27,9 +27,9 @@ win32 {
}
}

win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $${PWD}/../src/release/$${WIN_LIBPREFIX}RipesLib.$${WIN_LIBEXT}
else:win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $${PWD}/../src/debug/$${WIN_LIBPREFIX}RipesLib.$${WIN_LIBEXT}
else:unix: PRE_TARGETDEPS += $${PWD}/../src/libRipesLib.a
win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $${OUT_PWD}/../src/release/$${WIN_LIBPREFIX}RipesLib.$${WIN_LIBEXT}
else:win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $${OUT_PWD}/../src/debug/$${WIN_LIBPREFIX}RipesLib.$${WIN_LIBEXT}
else:unix: PRE_TARGETDEPS += $${OUT_PWD}/../src/libRipesLib.a

unix {
isEmpty(PREFIX) {
Expand Down
8 changes: 4 additions & 4 deletions test/test.pro
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ RESOURCES += tests.qrc
# Add RipesLib as a static library and as a PRE_TARGETDEPS.
# PRE_TARGETDEPS ensures that this application is relinked every time the
# target dependency is modified.
win32:CONFIG(release, debug|release): LIBS += -L$${PWD}/../src/release/ -lRipesLib
else:win32:CONFIG(debug, debug|release): LIBS += -L$${PWD}/../src/debug/ -lRipesLib
else:unix: LIBS += -L$${PWD}/../src/ -lRipesLib
win32:CONFIG(release, debug|release): LIBS += -L$${OUT_PWD}/../src/release/ -lRipesLib
else:win32:CONFIG(debug, debug|release): LIBS += -L$${OUT_PWD}/../src/debug/ -lRipesLib
else:unix: LIBS += -L$${OUT_PWD}/../src/ -lRipesLib

win32 {
# if cross compiling with MXE on unix, windows libraries will still be
Expand All @@ -30,4 +30,4 @@ win32 {

win32:CONFIG(release, debug|release): PRE_TARGETDEPS += $${PWD}/../src/release/$${WIN_LIBPREFIX}RipesLib.$${WIN_LIBEXT}
else:win32:CONFIG(debug, debug|release): PRE_TARGETDEPS += $${PWD}/../src/debug/$${WIN_LIBPREFIX}RipesLib.$${WIN_LIBEXT}
else:unix: PRE_TARGETDEPS += $${PWD}/../src/libRipesLib.a
else:unix: PRE_TARGETDEPS += $${OUT_PWD}/../src/libRipesLib.a

0 comments on commit d3ac2c2

Please sign in to comment.