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 4a978d158d)
r14.0.x
gregory guy 6 years ago committed by Slávek Banko
parent fed195cae2
commit 0e91f9e91b
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -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} )

@ -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}
)

Loading…
Cancel
Save