0001-Use-system-qscintilla2.patch 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. From: Arto Jantunen <viiru@debian.org>
  2. Date: Sun, 29 Oct 2017 13:34:01 +0200
  3. Subject: Use system qscintilla2
  4. ---
  5. cmake/FindQScintilla.cmake | 2 +-
  6. src/tests/CMakeLists.txt | 6 ++++++
  7. 2 files changed, 7 insertions(+), 1 deletion(-)
  8. diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake
  9. index 4d23177..400b408 100644
  10. --- a/cmake/FindQScintilla.cmake
  11. +++ b/cmake/FindQScintilla.cmake
  12. @@ -93,7 +93,7 @@ endif ()
  13. find_library ( QSCINTILLA_LIBRARY
  14. NAMES qscintilla2 qscintilla2_qt5
  15. - HINTS /usr/local/lib /usr/local/opt/qscintilla2/lib
  16. + HINTS ${QT_LIBRARY_DIR}
  17. )
  18. set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} )
  19. diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
  20. index ccf87c6..ff8bccf 100644
  21. --- a/src/tests/CMakeLists.txt
  22. +++ b/src/tests/CMakeLists.txt
  23. @@ -63,6 +63,9 @@ set(QT_LIBRARIES "")
  24. target_link_libraries(test-sqlobjects ${QT_LIBRARIES} ${LIBSQLITE})
  25. target_link_libraries(test-sqlobjects ${LPTHREAD})
  26. +link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
  27. +add_dependencies(test-sqlobjects qscintilla2_qt5)
  28. +target_link_libraries(test-sqlobjects qscintilla2_qt5)
  29. add_test(test-sqlobjects test-sqlobjects)
  30. # test-import
  31. @@ -140,6 +143,9 @@ set(QT_LIBRARIES "")
  32. target_link_libraries(test-regex ${QT_LIBRARIES} ${LIBSQLITE})
  33. target_link_libraries(test-regex ${LPTHREAD})
  34. +link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
  35. +add_dependencies(test-regex qscintilla2_qt5)
  36. +target_link_libraries(test-regex qscintilla2_qt5)
  37. add_test(test-regex test-regex)
  38. # test cache