Differential D2147

Fix building without D-Bus (and make it optional)
ClosedPublic
Actions

Authored by kossebau on Jul 12 2016, 11:58 PM.

Details

Reviewers
nienhueser
rahn
Group Reviewers
Marble
Commits
R34:8a17a4b8fe44: Fix building without D-Bus (and make it optional)
R34:665712fc232f: Set NSPrincipalClass:NSApplication in mac/Info.plist to get retina support
Summary
  • centralize control in a single var MARBLE_NO_DBUS (following pattern of MARBLE_NO_WEBKITWIDGETS)
  • move setting option BUILD_WITH_DBUS before finding of deps, so it can influence what is searched for (not sure if for Android this should be an option at all, but keeping for now as is)
Test Plan

Builds with BUILD_WITH_DBUS=ON and OFF for me.

Diff Detail

Repository
R34 Marble
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
kossebau updated this revision to Diff 5104.Jul 12 2016, 11:58 PM
kossebau retitled this revision from to Fix building without D-Bus (and make it optional).
kossebau updated this object.
kossebau edited the test plan for this revision. (Show Details)
kossebau added reviewers: Marble, nienhueser, rahn.
Closed by commit R34:665712fc232f: Set NSPrincipalClass:NSApplication in mac/Info.plist to get retina support (authored by stassats, committed by kossebau). · Explain WhyJul 14 2016, 6:11 PM
This revision was automatically updated to reflect the committed changes.
kossebau added a comment.Jul 14 2016, 6:19 PM

gah, used wrong id in other commit

kossebau added a comment.Jul 14 2016, 6:29 PM

To fix that up and given @nienhueser already gave positive comment on irc, will now land this simply using arc.

Revision Contents
Changeset List

PathPackages
Msrc/mac/Info.plist (2 lines)

Diff 5175

View Options

src/mac/Info.plist

Loading...