Skip to content

Commit

Permalink
Update QScintilla CMake find module to handle new lib name in 2.10
Browse files Browse the repository at this point in the history
[ci skip]
  • Loading branch information
dakcarto committed Feb 28, 2017
1 parent ac6cf19 commit b1c653b
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions cmake/FindQScintilla.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)

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

4 comments on commit b1c653b

@Scimmia22
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@dakcarto
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done in beb55d1 and 3057738.

@Scimmia22
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.