0.7.1 - Backport minor fixes and packaging from dev to master #1233
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
we should not look up the descriptor on the network as we already have a session with them
CMake will set version variables itself if you give the version in the project(), which is cleaner. Also removes some (nearly) duplicate definitions and settings added in basic_definitions.cmake for unknown reasons. Removes some redundant settings (name, description, version) from the cpack settings which already default to the values from the project() call.
Also installs it without the extra hack by specifying ../../Applications for the destination. (This definitely feels kind of nasty, but it works).
/usr/local is probably going to get stomped on by homebrew.
Codesigns and notarizes the package. Requires a bunch of stuff to
actually get this working. (see contrib/macos-signing.txt).
I'm currently also building with
-DLOKINET_GUI_REPO=https://github.com/jagerman/loki-network-control-panel.git -DLOKINET_GUI_CHECKOUT=cmake
because it needs the camke-ification PR for the control panel to
properly sign everything there.
Right after project() which contains the version, so that version + motto updates are basically in one place (and so that non-Makefile cmake invocations get it).
Needed to build against the right Qt
Including mostly windows/macos packaging changes, plus a few minor fixes.
Version definitions moved to CMakeLists.txt
|
can we attach this to #1229 |
notlesh
approved these changes
Apr 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Include mostly the packaging changes for windows/mac, but also minor fixes #1194 and #1198