Skip to content
Permalink
Browse files

Fix finding QScintilla for non-QT_INCLUDE_DIR install directories

  • Loading branch information
dakcarto committed Jul 23, 2014
1 parent 2365be0 commit 9a10b79354499fbba268623a269bcac1b4d776fa
Showing with 3 additions and 3 deletions.
  1. +2 −3 cmake/FindQScintilla.cmake
  2. +1 −0 src/providers/wfs/CMakeLists.txt
@@ -25,12 +25,11 @@ IF(EXISTS QSCINTILLA_VERSION_STR)
ELSE(EXISTS QSCINTILLA_VERSION_STR)

FIND_PATH(QSCINTILLA_INCLUDE_DIR
NAMES qsciglobal.h
NAMES Qsci/qsciglobal.h
PATHS
"${QT_INCLUDE_DIR}"
/usr/local/include
/usr/include
PATH_SUFFIXES Qsci
)

FIND_LIBRARY(QSCINTILLA_LIBRARY
@@ -56,7 +55,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
IF(QSCINTILLA_INCLUDE_DIR AND NOT EXISTS QSCINTILLA_VERSION_STR)
# get QScintilla2 version from header, is optinally retrieved via bindings
# 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}")
ENDIF(QSCINTILLA_INCLUDE_DIR AND NOT EXISTS QSCINTILLA_VERSION_STR)

@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES (
${GEOS_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}/geos
${EXPAT_INCLUDE_DIR}
${QSCINTILLA_INCLUDE_DIR}
)

ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS} ${WFS_MOC_SRCS})

0 comments on commit 9a10b79

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