Skip to content

Do not install desktop file and icons if headless #566

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

Merged
corrados merged 1 commit into from
Sep 3, 2020
Merged

Do not install desktop file and icons if headless #566

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 18 additions & 14 deletions Jamulus.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,22 +312,26 @@ win32 {
BINDIR = $$absolute_path($$BINDIR, $$PREFIX)
target.path = $$BINDIR

isEmpty(APPSDIR) {
APPSDIR = share/applications
}
APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX)
desktop.path = $$APPSDIR
QMAKE_SUBSTITUTES += distributions/jamulus.desktop.in
desktop.files = distributions/jamulus.desktop
contains(CONFIG, "headless") {
INSTALLS += target
} else {
isEmpty(APPSDIR) {
APPSDIR = share/applications
}
APPSDIR = $$absolute_path($$APPSDIR, $$PREFIX)
desktop.path = $$APPSDIR
QMAKE_SUBSTITUTES += distributions/jamulus.desktop.in
desktop.files = distributions/jamulus.desktop

isEmpty(ICONSDIR) {
ICONSDIR = share/icons/hicolor/512x512/apps
}
ICONSDIR = $$absolute_path($$ICONSDIR, $$PREFIX)
icons.path = $$ICONSDIR
icons.files = distributions/jamulus.png
isEmpty(ICONSDIR) {
ICONSDIR = share/icons/hicolor/512x512/apps
}
ICONSDIR = $$absolute_path($$ICONSDIR, $$PREFIX)
icons.path = $$ICONSDIR
icons.files = distributions/jamulus.png

INSTALLS += target desktop icons
INSTALLS += target desktop icons
}
}

RCC_DIR = src/res
Expand Down