mirror of
https://git.freebsd.org/ports.git
synced 2025-06-11 15:50:33 -04:00
85316befc9
(well) on FreeBSD. Then the port used en embedded copy of QScintilla.
Switch to using the system QScintilla.
This change is triggered by CMake 3.11, which tried to build the embedded
QScintilla slightly differently. That fails because there are header
files declaring enum { SCI_CANREDO = 2016 } *and also* header files
that #define SCI_CANREDO 2016; the include order is very fragile.
Also reported upstream.
Reviewed by: lbartoletti_tuxfamily (maintainer)
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D14930
27 lines
919 B
CMake
27 lines
919 B
CMake
The find module sets QSCINTILLA_INCLUDE_DIR to the directory containing
|
|
qsciscintilla.h, which in our case is already in the subdirectory Qsci/,
|
|
so (also) try another path for the version file. Accept only the Qt5
|
|
versions of the library.
|
|
|
|
--- cmake/FindQScintilla.cmake.orig 2017-09-20 13:59:51 UTC
|
|
+++ cmake/FindQScintilla.cmake
|
|
@@ -53,6 +53,10 @@ set ( QSCINTILLA_INCLUDE_DIRS ${QSCINTIL
|
|
|
|
# version
|
|
set ( _VERSION_FILE ${QSCINTILLA_INCLUDE_DIR}/Qsci/qsciglobal.h )
|
|
+if ( NOT EXISTS ${_VERSION_FILE} )
|
|
+ set ( _VERSION_FILE ${QSCINTILLA_INCLUDE_DIR}/qsciglobal.h )
|
|
+endif()
|
|
+
|
|
if ( EXISTS ${_VERSION_FILE} )
|
|
file ( STRINGS ${_VERSION_FILE} _VERSION_LINE REGEX "define[ ]+QSCINTILLA_VERSION_STR" )
|
|
if ( _VERSION_LINE )
|
|
@@ -80,7 +84,7 @@ endif ()
|
|
|
|
|
|
find_library ( QSCINTILLA_LIBRARY
|
|
- NAMES qscintilla qscintilla2 libqscintilla2
|
|
+ NAMES qscintilla2_qt5 libqscintilla2_qt5
|
|
HINTS ${QT_LIBRARY_DIR}
|
|
)
|
|
|