diff options
| author | Arto Jantunen <viiru@debian.org> | 2017-10-29 13:34:01 +0200 |
|---|---|---|
| committer | Arto Jantunen <viiru@debian.org> | 2023-08-17 12:13:30 +0300 |
| commit | f85229e59f3ee9d3dd163d4c668ad85371943cf6 (patch) | |
| tree | 7616ecb7a906479e3cc2f19cbfad0da22ea11bf4 | |
| parent | cca957b69eb60899ef87334b2ffdf33ed44eab53 (diff) | |
Use system qscintilla2
Gbp-Pq: Name 0001-Use-system-qscintilla2.patch
| -rw-r--r-- | cmake/FindQScintilla.cmake | 2 | ||||
| -rw-r--r-- | src/tests/CMakeLists.txt | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cmake/FindQScintilla.cmake b/cmake/FindQScintilla.cmake index 4d231774..400b4084 100644 --- a/cmake/FindQScintilla.cmake +++ b/cmake/FindQScintilla.cmake @@ -93,7 +93,7 @@ endif () find_library ( QSCINTILLA_LIBRARY NAMES qscintilla2 qscintilla2_qt5 - HINTS /usr/local/lib /usr/local/opt/qscintilla2/lib + HINTS ${QT_LIBRARY_DIR} ) set ( QSCINTILLA_LIBRARIES ${QSCINTILLA_LIBRARY} ) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index ccf87c64..ff8bccff 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -63,6 +63,9 @@ set(QT_LIBRARIES "") target_link_libraries(test-sqlobjects ${QT_LIBRARIES} ${LIBSQLITE}) target_link_libraries(test-sqlobjects ${LPTHREAD}) +link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}") +add_dependencies(test-sqlobjects qscintilla2_qt5) +target_link_libraries(test-sqlobjects qscintilla2_qt5) add_test(test-sqlobjects test-sqlobjects) # test-import @@ -140,6 +143,9 @@ set(QT_LIBRARIES "") target_link_libraries(test-regex ${QT_LIBRARIES} ${LIBSQLITE}) target_link_libraries(test-regex ${LPTHREAD}) +link_directories("${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}") +add_dependencies(test-regex qscintilla2_qt5) +target_link_libraries(test-regex qscintilla2_qt5) add_test(test-regex test-regex) # test cache |