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.

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

Win tests compilation fix. #2901

Merged
merged 1 commit into from
Feb 3, 2021
Merged

Conversation

allexzander
Copy link
Contributor

@allexzander allexzander commented Feb 2, 2021

Signed-off-by: allexzander blackslayer4@gmail.com

Fix for Windows build error of not being able to locate #include <sqlite3.h> in tests.

@allexzander allexzander force-pushed the win-tests-compilation-hot-fix branch from 4038d6f to 656e25f Compare February 2, 2021 18:37
@camilasan
Copy link
Member

You could expand on the commit message with what was the error. Just for later when looking at the git history it will be easy to understand what happened.

@FlexW
Copy link

FlexW commented Feb 2, 2021

If you change PRIVATE to PUBLIC on line 71 and 73 in src/csync/CMakeLists.txt it should also work and then sqlite3 will not be included globally. I think that should be the proper fix for that.

@allexzander
Copy link
Contributor Author

If you change PRIVATE to PUBLIC on line 71 and 73 in src/csync/CMakeLists.txt it should also work and then sqlite3 will not be included globally. I think that should be the proper fix for that.

@er-vin @camilasan

This sounds reasonable. Any objections? Asking, since I am not CMAKE-expert.

@er-vin
Copy link
Member

er-vin commented Feb 3, 2021

I agree with @FlexW this would be a better fix. We should slowly move to those more modern constructs.

@allexzander allexzander force-pushed the win-tests-compilation-hot-fix branch from f644f35 to 7504d07 Compare February 3, 2021 08:10
@allexzander
Copy link
Contributor Author

Alright then, @er-vin @FlexW @camilasan

Let's approve + merge it.

@allexzander allexzander changed the title Win tests compilation HOT-fix. Win tests compilation fix. Feb 3, 2021
@er-vin
Copy link
Member

er-vin commented Feb 3, 2021

@allexzander I'm fine with the content of the commit now, still could you please address @camilasan comment about have a more descriptive commit message? She's right that this kind of things might come in handy.

… of not being able to locate #include <sqlite3.h> in tests.

Signed-off-by: allexzander <blackslayer4@gmail.com>
@allexzander allexzander force-pushed the win-tests-compilation-hot-fix branch from 7504d07 to 3d266b9 Compare February 3, 2021 11:53
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-2901-3d266b9246bb61c810cf81858b0c2b6768c988d7-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@allexzander allexzander merged commit a94c109 into master Feb 3, 2021
@allexzander allexzander deleted the win-tests-compilation-hot-fix branch February 3, 2021 18:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants