sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-06 00:07:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix finding QScintilla for non-QT_INCLUDE_DIR install directories

Browse Source
This commit is contained in:
Larry Shaffer 2014-07-23 16:12:22 -06:00
parent 2365be0984
commit 9a10b79354
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/FindQScintilla.cmake
View File

@ -25,12 +25,11 @@ IF(EXISTS QSCINTILLA_VERSION_STR)
ELSE(EXISTS QSCINTILLA_VERSION_STR) ELSE(EXISTS QSCINTILLA_VERSION_STR)
FIND_PATH(QSCINTILLA_INCLUDE_DIR FIND_PATH(QSCINTILLA_INCLUDE_DIR
NAMES qsciglobal.h NAMES Qsci/qsciglobal.h
PATHS PATHS
"${QT_INCLUDE_DIR}" "${QT_INCLUDE_DIR}"
/usr/local/include /usr/local/include
/usr/include /usr/include
PATH_SUFFIXES Qsci
) )
FIND_LIBRARY(QSCINTILLA_LIBRARY FIND_LIBRARY(QSCINTILLA_LIBRARY
@ -56,7 +55,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
IF(QSCINTILLA_INCLUDE_DIR AND NOT EXISTS QSCINTILLA_VERSION_STR) IF(QSCINTILLA_INCLUDE_DIR AND NOT EXISTS QSCINTILLA_VERSION_STR)
# get QScintilla2 version from header, is optinally retrieved via bindings # get QScintilla2 version from header, is optinally retrieved via bindings
# with Qsci PyQt4 module # with Qsci PyQt4 module
FILE(READ ${QSCINTILLA_INCLUDE_DIR}/qsciglobal.h qsci_header) FILE(READ ${QSCINTILLA_INCLUDE_DIR}/Qsci/qsciglobal.h qsci_header)
STRING(REGEX REPLACE "^.*QSCINTILLA_VERSION_STR +\"([^\"]+)\".*$" "\\1" QSCINTILLA_VERSION_STR "${qsci_header}") STRING(REGEX REPLACE "^.*QSCINTILLA_VERSION_STR +\"([^\"]+)\".*$" "\\1" QSCINTILLA_VERSION_STR "${qsci_header}")
ENDIF(QSCINTILLA_INCLUDE_DIR AND NOT EXISTS QSCINTILLA_VERSION_STR) ENDIF(QSCINTILLA_INCLUDE_DIR AND NOT EXISTS QSCINTILLA_VERSION_STR)

1
src/providers/wfs/CMakeLists.txt
View File

@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES (
${GEOS_INCLUDE_DIR} ${GEOS_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}/geos ${GEOS_INCLUDE_DIR}/geos
${EXPAT_INCLUDE_DIR} ${EXPAT_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
) )
ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS} ${WFS_MOC_SRCS}) ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS} ${WFS_MOC_SRCS})