From 93b16bdad08e685d3b6fc1981dc50e92cfd4d0c3 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 22 Jan 2022 21:31:54 +0100 Subject: [PATCH] Improve detection of system qcustomplot/qhexedit --- cmake/FindQCustomPlot.cmake | 2 +- cmake/FindQHexEdit.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/FindQCustomPlot.cmake b/cmake/FindQCustomPlot.cmake index da936c5ef..70c64fec7 100644 --- a/cmake/FindQCustomPlot.cmake +++ b/cmake/FindQCustomPlot.cmake @@ -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) diff --git a/cmake/FindQHexEdit.cmake b/cmake/FindQHexEdit.cmake index 383623662..9fd17ad06 100644 --- a/cmake/FindQHexEdit.cmake +++ b/cmake/FindQHexEdit.cmake @@ -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)