Get rid of FindQt5Keychain.cmake #2603
Merged
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
added 2 commits
November 2, 2020 13:19
QtKeychain provides Qt5KeychainConfig.cmake and friends nowadays, so no need to have a less reliable and outdated find module on our end. Also this shows that we were including keychain.h in the wrong way and were not using the link target, so both got fixed as well. Signed-off-by: Kevin Ottens <[email protected]>
Now that things are done in a more standard way, let's adjust the AppImage build so that QtKeychain is picked up properly now that our FindQt5Keychain.cmake file is gone. Signed-off-by: Kevin Ottens <[email protected]>
er-vin
force-pushed
the
remove_findqt5keychain_cmake_module
branch
from
04df1f7 to
0e617d0
Compare
|
AppImage file: Nextcloud-PR-2603-0e617d020f6354e536687eb5a4423aae862d9e4a-x86_64.AppImage |
nicolasfella
approved these changes
Nov 2, 2020
| @@ -30,7 +30,7 @@ mkdir build | |||
| cd build | |||
| cmake -D CMAKE_INSTALL_PREFIX=/usr ../ | |||
| make -j4 | |||
| make DESTDIR=/app install | |||
There was a problem hiding this comment.
This looks unrelated?
Well actually not, /app wasn't in the paths the cmake was looking at to find qtkeychain.
camilasan
approved these changes
Nov 2, 2020
Exactly, now that it's in we should trigger all on master and see what fails. |
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.
QtKeychain provides Qt5KeychainConfig.cmake and friends nowadays, so no
need to have a less reliable and outdated find module on our end.
Also this shows that we were including keychain.h in the wrong way and
were not using the link target, so both got fixed as well.
Signed-off-by: Kevin Ottens [email protected]