From: Arto Jantunen <viiru@debian.org>
Date: Fri, 25 Jul 2014 16:28:47 +0300
Subject: Use external qcustomplot and antlr

---
 CMakeLists.txt           | 20 ++------------------
 src/tests/CMakeLists.txt |  2 +-
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a7eca91082..95e3b9cf9c86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,16 +46,8 @@ endif()
 find_package(Antlr2)
 
 set(QHEXEDIT_DIR libs/qhexedit)
-set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
-set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
 
-if(NOT ANTLR2_FOUND)
-    set(ANTLR_DIR libs/antlr-2.7.7)
-    add_subdirectory(${ANTLR_DIR})
-endif()
 add_subdirectory(${QHEXEDIT_DIR})
-add_subdirectory(${QCUSTOMPLOT_DIR})
-add_subdirectory(${QSCINTILLA_DIR})
 
 if(USE_QT5)
 	find_package(Qt5Widgets REQUIRED)
@@ -257,8 +249,6 @@ endif()
 include_directories(
 		"${CMAKE_CURRENT_BINARY_DIR}"
 		${QHEXEDIT_DIR}
-		${QCUSTOMPLOT_DIR}
-		${QSCINTILLA_DIR}
 		${ADDITIONAL_INCLUDE_PATHS}
 		src)
 if(ANTLR2_FOUND)
@@ -285,18 +275,12 @@ if(NOT ANTLR2_FOUND)
 endif()
 
 link_directories(
-		"${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
-		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
-		"${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
-		"${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
-if(NOT ANTLR2_FOUND)
-    link_directories("${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}")
-endif()
+		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}")
 
 target_link_libraries(${PROJECT_NAME}
 		qhexedit
 		qcustomplot
-		qscintilla2
+		qt5scintilla2
 		${QT_LIBRARIES}
 		${WIN32_STATIC_LINK}
 		${LIBSQLITE}
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 2ff97075048c..b240885a849b 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -75,7 +75,7 @@ endif()
 link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
 add_dependencies(test-sqlobjects qscintilla2)
 target_link_libraries(test-sqlobjects
-		qscintilla2)
+		qt5scintilla2)
 add_test(test-sqlobjects test-sqlobjects)
 
 # test-import