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.

Sign up for GitHub

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

Jump to bottom

Clean up QtCreator's package manager setup #5305

Merged
merged 7 commits into from
Jun 15, 2024
Merged

Clean up QtCreator's package manager setup #5305

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bcef9df
Skip conan and vcpkg autosetup when using QtCreator
hemirt Apr 7, 2024
471e486
Update CHANGELOG.md
hemirt May 20, 2024
08ef76a
Skip VCPKG auto-setup, keep Conan auto-setup
hemirt Jun 6, 2024
475c43e
Merge branch 'master' into master
hemirt Jun 6, 2024
07dd2cb
Update CHANGELOG.md
hemirt Jun 6, 2024
aa0523f
Merge branch 'master' into master
pajlada Jun 8, 2024
33de14e
Merge branch 'master' into master
pajlada Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- Dev: Make printing of strings in tests easier. (#5379)
- Dev: Refactor and document `Scrollbar`. (#5334, #5393)
- Dev: Reduced the amount of scale events. (#5404, #5406)
- Dev: Skip conan and vcpkg autosetup when using QtCreator. (#5305)

## 2.5.1

Expand Down
7 changes: 7 additions & 0 deletions QtCreatorPackageManager.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
if (NOT QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP)
message(STATUS "Skipping Qt Creator automatic package manager (skipping Conan and VCPKG) - check QtCreatorPackageManager.cmake for more details")
endif()

set(QT_CREATOR_SKIP_PACKAGE_MANAGER_SETUP ON)
set(QT_CREATOR_SKIP_CONAN_SETUP ON)
set(QT_CREATOR_SKIP_VCPKG_SETUP ON)
hemirt marked this conversation as resolved.
Show resolved Hide resolved