diff options
| author | gregory guy <g-gregory@gmx.fr> | 2019-01-12 16:52:26 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-01-12 17:36:57 +0100 |
| commit | 0e91f9e91b851788bf7d00a95806c904e1f771ca (patch) | |
| tree | 8057917e1269fcd709fd46da776e232953aa9ce2 | |
| parent | fed195cae2cb376b3205e176f7a61c401bf00ace (diff) | |
| download | tdeio-sword-0e91f9e91b851788bf7d00a95806c904e1f771ca.tar.gz tdeio-sword-0e91f9e91b851788bf7d00a95806c904e1f771ca.zip | |
remove unnecessaries in the search for the sword library and correct src/CMakeLists.txt accordingly
Signed-off-by: gregory guy <g-gregory@gmx.fr>
(cherry picked from commit 4a978d158dfda21298c91d76358127dd2cc3ee98)
| -rw-r--r-- | ConfigureChecks.cmake | 12 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 14 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index ba07902..066f3cc 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -50,15 +50,3 @@ pkg_search_module( LIBSWORD sword ) if( NOT LIBSWORD_FOUND ) tde_message_fatal( "The sword library is required but was not found on your system." ) endif( NOT LIBSWORD_FOUND ) - -find_path( LIBSWORD_INCLUDE_DIR swbasicfilter.h - HINTS ${LIBSWORD_INCLUDEDIR} ${LIBSWORD_INCLUDE_DIRS} - PATH_SUFFIXES sword -) - -find_library( LIBSWORD_LIBRARY NAMES libsword sword - HINTS ${LIBSWORD_LIBDIR} ${LIBSWORD_LIBRARY_DIRS} -) - -set( LIBSWORD_LIBRARIES ${LIBSWORD_LIBRARY} ) -set( LIBSWORD_INCLUDE_DIRS ${LIBSWORD_INCLUDE_DIR} ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1697ec1..8e170cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} - ${LIBSWORD_INCLUDE_DIR} + ${LIBSWORD_INCLUDE_DIRS} ) link_directories( @@ -35,7 +35,7 @@ tde_add_kpart( tdeio_sword AUTOMOC LINK tdecore-shared tdeio-shared - ${LIBSWORD_LIBRARY} + ${LIBSWORD_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) |