Update QScintilla CMake module; handle 2.10 name; backport 2.18 change

[ci skip] kind of cherry-picked from b1c653b and fb3fcfa
qgis · Feb 28, 2017 · f887965 · f887965
1 parent cbed95c
commit f887965
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
@@ -34,7 +34,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
     )
 
   if(ENABLE_QT5)
-    set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)
+    set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 qscintilla2_qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)
   else(ENABLE_QT5)
     set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib)
   endif(ENABLE_QT5)