Skip to content

Commit afb15d2

Browse files
committed
install bins from pushpin.pro and remove unused lib.pri
1 parent c269870 commit afb15d2

File tree

3 files changed

+20
-27
lines changed

3 files changed

+20
-27
lines changed

src/pushpin/pushpin.pro

+20
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ TEMPLATE = aux
22

33
include($$OUT_PWD/../../conf.pri)
44

5+
bin_dir = $$PWD/../../bin
6+
root_dir = $$PWD/../..
7+
58
# generate pushpin.conf for installation
69

710
pushpin_conf_inst.target = pushpin.conf.inst
@@ -11,6 +14,23 @@ pushpin_conf_inst.depends = ../../examples/config/pushpin.conf
1114
QMAKE_EXTRA_TARGETS += pushpin_conf_inst
1215
PRE_TARGETDEPS += pushpin.conf.inst
1316

17+
# install bin files
18+
19+
unix:!isEmpty(BINDIR) {
20+
binfiles.path = $$BINDIR
21+
binfiles.files = \
22+
$$bin_dir/condure \
23+
$$bin_dir/m2adapter \
24+
$$bin_dir/pushpin-proxy \
25+
$$bin_dir/pushpin-handler \
26+
$$root_dir/pushpin-legacy \
27+
$$root_dir/pushpin \
28+
$$bin_dir/pushpin-publish
29+
binfiles.CONFIG += no_check_exist executable
30+
31+
INSTALLS += binfiles
32+
}
33+
1434
# install lib files
1535

1636
libfiles.path = $$LIBDIR

src/rust/lib.pri

-12
This file was deleted.

src/rust/rust.pro

-15
Original file line numberDiff line numberDiff line change
@@ -110,18 +110,3 @@ PRE_TARGETDEPS += \
110110
$$root_dir/pushpin-legacy \
111111
$$root_dir/pushpin \
112112
$$bin_dir/pushpin-publish
113-
114-
unix:!isEmpty(BINDIR) {
115-
binfiles.path = $$BINDIR
116-
binfiles.files = \
117-
$$bin_dir/condure \
118-
$$bin_dir/m2adapter \
119-
$$bin_dir/pushpin-proxy \
120-
$$bin_dir/pushpin-handler \
121-
$$root_dir/pushpin-legacy \
122-
$$root_dir/pushpin \
123-
$$bin_dir/pushpin-publish
124-
binfiles.CONFIG += no_check_exist executable
125-
126-
INSTALLS += binfiles
127-
}

0 commit comments

Comments
 (0)