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

Make QCoro builds for Qt5 and Qt6 co-installable (#36) #37

Merged
merged 4 commits into from Jan 6, 2022

Conversation

danvratil
Copy link
Owner

No description provided.

The basename everywhere is QCoro5 and QCoro6 now - from CMake to
includes:

CMake:
`find_package(QCoro5)`
`target_link_libraries(target QCoro5::Core)`

Output paths:
`libQCoro5Core.so`
`/usr/include/qcoro5`
`/usr/include/QCoro5`

This should require no changes to C++ code, only adjustments to CMake
code to look for the correct version of QCoro.

Fixes #36.
@github-actions
Copy link
Contributor

github-actions bot commented Jan 5, 2022

Unit Test Results

  6 files  ±0    6 suites  ±0   2m 50s ⏱️ -1s
13 tests ±0  13 ✔️ ±0  0 💤 ±0  0 ±0 
73 runs  ±0  73 ✔️ ±0  0 💤 ±0  0 ±0 

Results for commit 54a8c0b. ± Comparison against base commit d599729.

♻️ This comment has been updated with latest results.

This changes how QCoro is used in CMake:

```
find_package(QCoro5 REQUIRED COMPONENTS Core Network DBus)
```

Replace `QCoro5` with `QCoro6` to use Qt6 build of QCoro. When linking
against QCoro, the targets are called QCoro{5,6}::{Core,Network,DBus},
but one can also use version-less target names, i.e. QCoro::Core will
link against whatever version of QCoro has been found by `find_package`.

Simply put, using QCoro in CMake should now match how Qt itself is being
used in CMake.
@danvratil danvratil merged commit 24fa9ac into main Jan 6, 2022
@danvratil danvratil deleted the qt-coinstall branch January 6, 2022 12:41
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.

None yet

1 participant