From 7143ce20bb9d49162911a13f2a7502b4963af377 Mon Sep 17 00:00:00 2001 From: Salil Wadnerkar Date: Sat, 12 Aug 2017 14:12:13 -0700 Subject: [PATCH] tora doesn't do a good job of finding qscintilla2 library installed on the system --- .gitignore | 7 +++++++ cmake/modules/FindQScintilla.cmake | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4ef9b424..03372f36 100755 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,10 @@ gitrevision.bat **/*.p12 **/*.rej **/*.orig + +######################################## +# cmake # +######################################## +# build directory naming convention +build/ +LastVersion.txt diff --git a/cmake/modules/FindQScintilla.cmake b/cmake/modules/FindQScintilla.cmake index 1e9f6966..8f629148 100644 --- a/cmake/modules/FindQScintilla.cmake +++ b/cmake/modules/FindQScintilla.cmake @@ -84,7 +84,7 @@ IF(Qt5Widgets_FOUND) SET(LIBRARYPATH ${QT5_WIDGETSLIBRARYPATH} "/usr/lib/" "/usr/local/lib") MESSAGE("QScintilla2 LIBPATH \"${LIBRARYPATH}\"") - FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qscintilla2-qt5 qt5scintilla2 libqscintilla2.so libqscintilla2.a qscintilla2.lib PATHS ${LIBRARYPATH}) + FIND_LIBRARY(QSCINTILLA_LIBRARY NAMES qscintilla2-qt5 qt5scintilla2 libqscintilla2_qt5.so libqscintilla2.so libqscintilla2.a qscintilla2.lib PATHS ${LIBRARYPATH}) # Check IF(QSCINTILLA_LIBRARY)