Add qt PATH_SUFFIXES to find QScintilla2 includes; match conda-forge qt

dakcarto · dakcarto · commit 2069dc7a97b1 · 2018-10-15T16:19:22.000-06:00
For builds using dependencies from conda-forge, also search in qt
recipe's include path at &lt;prefix&gt;/include/qt
diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
@@ -56,6 +56,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
       "${QT_INCLUDE_DIR}"
       /usr/local/include
       /usr/include
+    PATH_SUFFIXES qt
     )
 
   IF(QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)`
`56`	`56`	`"${QT_INCLUDE_DIR}"`
`57`	`57`	`/usr/local/include`
`58`	`58`	`/usr/include`
	`59`	`+ PATH_SUFFIXES qt`
`59`	`60`	`)`
`60`	`61`
`61`	`62`	`IF(QSCINTILLA_LIBRARY AND QSCINTILLA_INCLUDE_DIR)`