diff --git a/CMakeLists.txt b/CMakeLists.txt index d0209c56..09acae11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -468,7 +468,7 @@ endif() if(QSCINTILLA_FOUND) target_link_libraries(${PROJECT_NAME} ${QSCINTILLA_LIBRARIES}) else() - target_link_libraries(${PROJECT_NAME} qscintilla2) + target_link_libraries(${PROJECT_NAME} qscintilla2-qt5) endif() if(WIN32 AND MSVC) diff --git a/cmake/FindQCustomPlot.cmake b/cmake/FindQCustomPlot.cmake index da936c5e..5eb5222e 100644 --- a/cmake/FindQCustomPlot.cmake +++ b/cmake/FindQCustomPlot.cmake @@ -31,10 +31,11 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -find_library(QCustomPlot_LIBRARY qcustomplot) +find_library(QCustomPlot_LIBRARY qcustomplot-qt5) set(QCustomPlot_LIBRARIES "${QCustomPlot_LIBRARY}") find_path(QCustomPlot_INCLUDE_DIR qcustomplot.h) +find_path(QCustomPlot_INCLUDE_DIR qcustomplot.h PATH_SUFFIXES qt5) set(QCustomPlot_INCLUDE_DIRS "${QCustomPlot_INCLUDE_DIR}") include(FindPackageHandleStandardArgs) diff --git a/cmake/FindQHexEdit.cmake b/cmake/FindQHexEdit.cmake index 38362366..17278f5c 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 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) diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake index 4d231774..09d43e00 100644 --- a/cmake/FindQScintilla.cmake +++ b/cmake/FindQScintilla.cmake @@ -55,7 +55,7 @@ if(UNIX) list(APPEND Qt5QScintillaHintDirs "${item}/Qsci") endforeach() endif() -find_path ( QSCINTILLA_INCLUDE_DIR qsciscintilla.h +find_path ( QSCINTILLA_INCLUDE_DIR qsciscintilla.h PATH_SUFFIXES qt5 HINTS /usr/local/include/Qsci /usr/local/opt/qscintilla2/include/Qsci ${Qt5QScintillaHintDirs}