Skip to content
Permalink
Browse files

Update QScintilla CMake find module to handle new lib name in 2.10

[ci skip]
  • Loading branch information
dakcarto committed Feb 28, 2017
1 parent ac6cf19 commit b1c653b24963eb45f9f5d0471e3ed17c19c5bf54
Showing with 1 addition and 0 deletions.
  1. +1 −0 cmake/FindQScintilla.cmake
@@ -26,6 +26,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)

set(QSCINTILLA_LIBRARY_NAMES
qscintilla2-qt5
qscintilla2_qt5
libqt5scintilla2
libqscintilla2-qt5
qt5scintilla2

4 comments on commit b1c653b

@Scimmia22

This comment has been minimized.

Copy link
Contributor

@Scimmia22 Scimmia22 replied Mar 2, 2017

This only does half the job. The names changed for Qt4 as well.

@dakcarto

This comment has been minimized.

Copy link
Member Author

@dakcarto dakcarto replied Mar 2, 2017

Hi @Scimmia22, thanks for pointing that out; though, adding that support here for QGIS 3 is unnecessary, since Qt4 is deprecated and not used. However, the backports to QGIS 2.14/2.18 should have that added.

@dakcarto

This comment has been minimized.

Copy link
Member Author

@dakcarto dakcarto replied Mar 2, 2017

Done in beb55d1 and 3057738.

@Scimmia22

This comment has been minimized.

Copy link
Contributor

@Scimmia22 Scimmia22 replied Mar 3, 2017

Funnily enough, I meant this comment to be on the commit in the 2.18 branch. No idea how I ended up here. :)
Thanks for taking care of it.

Please sign in to comment.
You can’t perform that action at this time.