Fixes FindQwt.cmake on archlinux #2545
Conversation
|
@sab24 Thanks for your work here! Please post when this PR is ready to go in your opinion && we'll review it. |
|
Hi @michaelld, thanks for the reply. I tested it on archlinux, there it builds fine and all tests pass. Also on buildbot it is working, so I think it is ready for review. |
|
@sab24 great! Will do. |
Thanks for the review. I have no idea how to squash them, I tried, it only added more commits :( |
|
@sab24 You can @sab24 Do we have a CLA for you? @marcusmueller Does this require one? Seems long-ish. |
…n its name and checks version of headers and library. Fixes issue on Arch Linux with QWT 6
sab24
force-pushed
the
archlinux-find-qwt
branch
from
d7c3688
to
617eeb9
Compare
@mbr0wn, fixed, had to push --force to push rebased commits remotely. According to your policy more than 10 lines requires a copyright assignment. Can you provide me instructions on how to do so? |
|
@sab24 Thanks for squashing! push --force was the correct choice. For the CLA, please contact bhilburn at gnuradio dot org. Thank you so much! |
| @@ -29,7 +29,7 @@ find_path(QWT_INCLUDE_DIRS | |||
| ) | |||
|
|
|||
| find_library (QWT_LIBRARIES | |||
| NAMES ${PC_QWT_LIBRARIES} qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION} | |||
| NAMES qwt ${PC_QWT_LIBRARIES} qwt6-${QWT_QT_VERSION} qwt-${QWT_QT_VERSION} | |||
There was a problem hiding this comment.
In my testing on OSX with both Qwt52 and Qt5Qwt6 installed, putting stock "qwt" here first will result in -any- libqwt that's found being used (in my case, Qwt52), which is not desirable. What we want is for this entry to be last (or at least not first), so that whatever (if anything) PC found is found first, then the other names, then this.
There was a problem hiding this comment.
Good point! PC must always come first, or it's not being used.
There was a problem hiding this comment.
What exactly needs to be done here?
|
We have both merge conflicts, and the "Needs CLA" label has been lingering for too long. I'm closing this. However, that's more for the PR queue to be not too crazy. Please reopen or resubmit once the CLA is in, and the PR is working again. |
Hi,
I tried to update the FindQwt.cmake file to find the version number in the file /usr/lib/libqwt.so on archlinux that does not have the version number in the filename like for example qwt6-[version]
I hope this improves the cmake file. I have only tested it on archlinux.