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

Cleanup cmake #60028

Merged
merged 10 commits into from
Dec 31, 2024
Merged

Cleanup cmake #60028

merged 10 commits into from
Dec 31, 2024

Conversation

m-kuhn
Copy link
Member

@m-kuhn m-kuhn commented Dec 30, 2024

Use versionless qt macros, these are supported since Qt 5.15 (which we require everywhere nowadays). Less if(BUILD_WITH_QT6), less code.
This also makes use of the PostgreSQL::PostgreSQL target (and drops plenty of manually specified postgres include dirs which are very likely leftovers from copy pasting code)

@github-actions github-actions bot added this to the 3.42.0 milestone Dec 30, 2024
src/core/CMakeLists.txt Outdated Show resolved Hide resolved
Copy link

github-actions bot commented Dec 30, 2024

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 2ea9e79)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 2ea9e79)

@m-kuhn m-kuhn changed the title Use versionless qt cmake commands Cleanup cmake Dec 30, 2024
Copy link
Collaborator

@nyalldawson nyalldawson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work!

@m-kuhn m-kuhn merged commit 489b8f7 into qgis:master Dec 31, 2024
31 checks passed
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.

2 participants