Skip to content

Commit

Permalink
Refactored qmake dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@AmonRaNet
AmonRaNet committed Jan 7, 2024
1 parent a299f91 commit f65e977
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 93 deletions.
16 changes: 1 addition & 15 deletions QGeoView.pro
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
CONFIG += ordered
TEMPLATE = subdirs
SUBDIRS = \
lib \
Expand All @@ -15,18 +16,3 @@ SUBDIRS = \
samples/moving-objects \
samples/mouse-actions \
samples/camera-actions

samples.shared.depends = lib
samples.basic.depends = lib samples.shared
samples.background.depends = lib samples.shared
samples.widgets.depends = lib samples.shared
samples.flags.depends = lib samples.shared
samples.layers.depends = lib samples.shared
samples.fun.depends = lib samples.shared
samples.10000.depends = lib samples.shared
samples.debug.depends = lib samples.shared
samples.performance.depends = lib samples.shared
samples.custom-tiles.depends = lib samples.shared
samples.moving-objects.depends = lib samples.shared
samples.mouse-actions.depends = lib samples.shared
samples.camera-actions.depends = lib samples.shared
5 changes: 0 additions & 5 deletions lib/lib.pri
View file

This file was deleted.

7 changes: 2 additions & 5 deletions samples/10000/10000.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/background/background.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/basic/basic.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/camera-actions/camera-actions.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/custom-tiles/custom-tiles.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/debug/debug.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/flags/flags.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/fun/fun.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/layers/layers.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
12 changes: 12 additions & 0 deletions samples/lib.pri
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
PROJECT_SRC_ROOT = $$PWD/..
PROJECT_BUILD_ROOT = $$OUT_PWD/../..

INCLUDEPATH += \
$$PROJECT_SRC_ROOT/lib/include/ \
$$PROJECT_SRC_ROOT/lib/include/QGeoView/

CONFIG(release, debug|release): LIBS += -L$$PROJECT_BUILD_ROOT/lib/release
CONFIG(debug, debug|release): LIBS += -L$$PROJECT_BUILD_ROOT/lib/debug
LIBS += -L$$PROJECT_BUILD_ROOT/lib

LIBS += -lqgeoview
7 changes: 2 additions & 5 deletions samples/mouse-actions/mouse-actions.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/moving-objects/moving-objects.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
7 changes: 2 additions & 5 deletions samples/performance/performance.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down
11 changes: 11 additions & 0 deletions samples/shared.pri
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
PROJECT_SRC_ROOT = $$PWD/..
PROJECT_BUILD_ROOT = $$OUT_PWD/..

INCLUDEPATH += \
$$PROJECT_SRC_ROOT/samples/shared

CONFIG(release, debug|release): LIBS += -L$$PROJECT_BUILD_ROOT/shared/release
CONFIG(debug, debug|release): LIBS += -L$$PROJECT_BUILD_ROOT/shared/debug
LIBS += -L$$PROJECT_BUILD_ROOT/shared

LIBS += -lqgeoview-samples-shared
2 changes: 0 additions & 2 deletions samples/shared/shared.pri
View file

This file was deleted.

7 changes: 1 addition & 6 deletions samples/shared/shared.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ CONFIG += staticlib

QT += gui widgets network

include(../../lib/lib.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
include(../lib.pri)

SOURCES += \
$$PWD/helpers.cpp \
Expand All @@ -17,6 +15,3 @@ HEADERS += \
$$PWD/helpers.h \
$$PWD/placemarkcircle.h \
$$PWD/rectangle.h

INCLUDEPATH += \
$$PWD/
7 changes: 2 additions & 5 deletions samples/widgets/widgets.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ CONFIG-= console

QT += gui widgets network

include(../../lib/lib.pri)
include(../shared/shared.pri)

LIBS += -L$$OUT_PWD/../../lib -lqgeoview
LIBS += -L$$OUT_PWD/../shared -lqgeoview-samples-shared
include(../lib.pri)
include(../shared.pri)

SOURCES += \
main.cpp \
Expand Down

0 comments on commit f65e977

Please sign in to comment.