summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgregory guy <g-gregory@gmx.fr>2019-01-12 16:52:26 +0100
committergregory guy <g-gregory@gmx.fr>2019-01-12 16:52:26 +0100
commit4a978d158dfda21298c91d76358127dd2cc3ee98 (patch)
treec4688f5ae7cfc8a683c261f7c166de2bb0e4c5e5
parent374417024147717d195e1830bb72d057995b0aa8 (diff)
downloadtdeio-sword-4a978d158dfda21298c91d76358127dd2cc3ee98.tar.gz
tdeio-sword-4a978d158dfda21298c91d76358127dd2cc3ee98.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>
-rw-r--r--ConfigureChecks.cmake12
-rw-r--r--src/CMakeLists.txt4
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}
)