blob: fb714654579d648f0456ffdd0902b36e1e3ba9a1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
From 30577386cbe0ee9a5509e7f6f54df2c1194153ee Mon Sep 17 00:00:00 2001
From: Larry Shaffer <lshaffer@boundlessgeo.com>
Date: Thu, 2 Mar 2017 15:00:18 -0700
Subject: [PATCH] Followup to dfe268f; update QScintilla new lib name in 2.10
for Qt4
[ci skip]
---
cmake/FindQScintilla.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
index 7f97624..2f87e4c 100644
--- a/cmake/FindQScintilla.cmake
+++ b/cmake/FindQScintilla.cmake
@@ -36,7 +36,7 @@ ELSE(EXISTS QSCINTILLA_VERSION_STR)
if(ENABLE_QT5)
set(QSCINTILLA_LIBRARY_NAMES qscintilla2-qt5 qscintilla2_qt5 libqt5scintilla2 libqscintilla2-qt5 qt5scintilla2 libqscintilla2-qt5.dylib)
else(ENABLE_QT5)
- set(QSCINTILLA_LIBRARY_NAMES qscintilla2 libqscintilla2 libqscintilla2.dylib)
+ set(QSCINTILLA_LIBRARY_NAMES qscintilla2 qscintilla2_qt4 libqscintilla2 libqscintilla2.dylib)
endif(ENABLE_QT5)
find_library(QSCINTILLA_LIBRARY
|
GitWeb
