Skip to content

Improve detection of system qcustomplot/qhexedit #2952

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

Merged
mgrojo merged 1 commit into from
Feb 13, 2022
Merged

Improve detection of system qcustomplot/qhexedit #2952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/FindQCustomPlot.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


find_library(QCustomPlot_LIBRARY qcustomplot)
find_library(QCustomPlot_LIBRARY NAMES qcustomplot qcustomplot-qt5)
set(QCustomPlot_LIBRARIES "${QCustomPlot_LIBRARY}")

find_path(QCustomPlot_INCLUDE_DIR qcustomplot.h)
Expand Down
4 changes: 2 additions & 2 deletions cmake/FindQHexEdit.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


find_library(QHexEdit_LIBRARY qhexedit)
find_library(QHexEdit_LIBRARY NAMES qhexedit qhexedit-qt5)
set(QHexEdit_LIBRARIES "${QHexEdit_LIBRARY}")

find_path(QHexEdit_INCLUDE_DIR qhexedit.h)
find_path(QHexEdit_INCLUDE_DIR qhexedit.h PATH_SUFFIXES qhexedit2)
set(QHexEdit_INCLUDE_DIRS "${QHexEdit_INCLUDE_DIR}")

include(FindPackageHandleStandardArgs)
Expand Down