Skip to content

Commit 5dc8c61

Browse files
committed
updates build scripts: adds version number and removes no longer needed include paths.
1 parent 70e614b commit 5dc8c61

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

AdvancedDockingSystem/AdvancedDockingSystem.pro

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
TARGET = AdvancedDockingSystem
2-
#VERSION = 0.1.0
2+
TEMPLATE = lib
3+
VERSION = 1.0.0
4+
35
CONFIG += adsBuildShared
46

57
QT += core gui
68
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
79
greaterThan(QT_MAJOR_VERSION, 4): DEFINES += ADS_NAMESPACE_ENABLED
810

9-
TEMPLATE = lib
10-
1111
adsBuildShared {
1212
CONFIG += shared
1313
DEFINES += ADS_EXPORT
@@ -16,7 +16,6 @@ adsBuildShared {
1616
CONFIG += staticlib
1717
}
1818

19-
INCLUDEPATH += $$PWD/src
2019
INCLUDEPATH += $$PWD/include
2120

2221
windows {
@@ -33,4 +32,4 @@ windows {
3332
RESOURCES += \
3433
res/ads.qrc
3534

36-
include(AdvancedDockingSystem.pri)
35+
include(AdvancedDockingSystem.pri)

AdvancedDockingSystemDemo/AdvancedDockingSystemDemo.pro

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@ TARGET = AdvancedDockingSystemDemo
22

33
QT += core gui
44
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
5-
6-
TEMPLATE = app
7-
8-
INCLUDEPATH += $$PWD/src
9-
105
greaterThan(QT_MAJOR_VERSION, 4): DEFINES += ADS_NAMESPACE_ENABLED
116

127
windows {
@@ -52,9 +47,9 @@ FORMS += \
5247
#else:unix: PRE_TARGETDEPS += $$OUT_PWD/../AdvancedDockingSystem/libAdvancedDockingSystem.a
5348

5449
# Dependency: AdvancedDockingSystem (shared)
55-
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/release/ -lAdvancedDockingSystem
56-
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem
57-
else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem
50+
win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/release/ -lAdvancedDockingSystem1
51+
else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/debug/ -lAdvancedDockingSystem1
52+
else:unix: LIBS += -L$$OUT_PWD/../AdvancedDockingSystem/ -lAdvancedDockingSystem1
5853

5954
INCLUDEPATH += $$PWD/../AdvancedDockingSystem/include
6055
DEPENDPATH += $$PWD/../AdvancedDockingSystem/include

0 commit comments

Comments
 (0)