Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install bins from pushpin.pro and remove unused lib.pri #47786

Merged
merged 2 commits into from
Nov 17, 2023
Merged

install bins from pushpin.pro and remove unused lib.pri #47786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afb15d2
install bins from pushpin.pro and remove unused lib.pri
jkarneges Nov 16, 2023
bdb33e8
bin_dir nit
jkarneges Nov 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions src/pushpin/pushpin.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ TEMPLATE = aux

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

bin_dir = $$PWD/../../bin
root_dir = $$PWD/../..
jkarneges marked this conversation as resolved.
Show resolved Hide resolved

# generate pushpin.conf for installation

pushpin_conf_inst.target = pushpin.conf.inst
Expand All @@ -11,6 +14,23 @@ pushpin_conf_inst.depends = ../../examples/config/pushpin.conf
QMAKE_EXTRA_TARGETS += pushpin_conf_inst
PRE_TARGETDEPS += pushpin.conf.inst

# install bin files

unix:!isEmpty(BINDIR) {
binfiles.path = $$BINDIR
binfiles.files = \
$$bin_dir/condure \
$$bin_dir/m2adapter \
$$bin_dir/pushpin-proxy \
$$bin_dir/pushpin-handler \
$$root_dir/pushpin-legacy \
$$root_dir/pushpin \
$$bin_dir/pushpin-publish
binfiles.CONFIG += no_check_exist executable

INSTALLS += binfiles
}

# install lib files

libfiles.path = $$LIBDIR
Expand Down
12 changes: 0 additions & 12 deletions src/rust/lib.pri
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/rust/rust.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,18 +110,3 @@ PRE_TARGETDEPS += \
$$root_dir/pushpin-legacy \
$$root_dir/pushpin \
$$bin_dir/pushpin-publish

unix:!isEmpty(BINDIR) {
binfiles.path = $$BINDIR
binfiles.files = \
$$bin_dir/condure \
$$bin_dir/m2adapter \
$$bin_dir/pushpin-proxy \
$$bin_dir/pushpin-handler \
$$root_dir/pushpin-legacy \
$$root_dir/pushpin \
$$bin_dir/pushpin-publish
binfiles.CONFIG += no_check_exist executable

INSTALLS += binfiles
}