From 7985a0b5c58e48a01bdf971c4bf4faf712e81f2b Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Fri, 29 Jan 2010 19:00:48 +0100 Subject: [PATCH] KIO slave: fixed CMakeList to configure Recoll with --enable-pic --- src/kde/kioslave/recoll/CMakeLists.txt | 69 +++----------------------- 1 file changed, 7 insertions(+), 62 deletions(-) diff --git a/src/kde/kioslave/recoll/CMakeLists.txt b/src/kde/kioslave/recoll/CMakeLists.txt index 28270876..e09bef17 100644 --- a/src/kde/kioslave/recoll/CMakeLists.txt +++ b/src/kde/kioslave/recoll/CMakeLists.txt @@ -15,13 +15,17 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") set(rcltop ${CMAKE_CURRENT_SOURCE_DIR}/../../../) # Execute minimum recoll configuration to create autoconfig.h and version.h -execute_process(COMMAND ${rcltop}/configure --without-gui --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man +execute_process(COMMAND ${rcltop}/configure --without-gui --enable-pic --prefix=${CMAKE_INSTALL_PREFIX} --mandir=${CMAKE_INSTALL_PREFIX}/share/man WORKING_DIRECTORY ${rcltop} ) execute_process(COMMAND make common/rclversion.h WORKING_DIRECTORY ${rcltop} ) +execute_process(COMMAND make + WORKING_DIRECTORY ${rcltop}/lib +) +link_directories(${rcltop}/lib) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${rcltop}/aspell @@ -35,66 +39,7 @@ include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${rcltop}/utils ) -set(kio_recoll_SRCS kio_recoll.cpp htmlif.cpp dirif.cpp -${rcltop}/aspell/rclaspell.cpp -${rcltop}/bincimapmime/mime-getpart.cc -${rcltop}/bincimapmime/mime-parsefull.cc -${rcltop}/bincimapmime/mime-parseonlyheader.cc -${rcltop}/bincimapmime/mime-printbody.cc -${rcltop}/bincimapmime/mime-printdoc.cc -${rcltop}/bincimapmime/mime-printheader.cc -${rcltop}/bincimapmime/mime.cc -${rcltop}/bincimapmime/convert.cc -${rcltop}/bincimapmime/iodevice.cc -${rcltop}/bincimapmime/iofactory.cc -${rcltop}/common/rclconfig.cpp -${rcltop}/common/rclinit.cpp -${rcltop}/common/textsplit.cpp -${rcltop}/common/unacpp.cpp -${rcltop}/index/mimetype.cpp -${rcltop}/index/beaglequeue.cpp -${rcltop}/internfile/htmlparse.cpp -${rcltop}/internfile/internfile.cpp -${rcltop}/internfile/myhtmlparse.cpp -${rcltop}/internfile/mimehandler.cpp -${rcltop}/internfile/mh_exec.cpp -${rcltop}/internfile/mh_execm.cpp -${rcltop}/internfile/mh_html.cpp -${rcltop}/internfile/mh_mail.cpp -${rcltop}/internfile/mh_mbox.cpp -${rcltop}/internfile/mh_text.cpp -${rcltop}/query/docseq.cpp -${rcltop}/query/docseqdb.cpp -${rcltop}/query/plaintorich.cpp -${rcltop}/query/reslistpager.cpp -${rcltop}/query/wasastringtoquery.cpp -${rcltop}/query/wasatorcl.cpp -${rcltop}/rcldb/rcldb.cpp -${rcltop}/rcldb/rcldoc.cpp -${rcltop}/rcldb/rclquery.cpp -${rcltop}/rcldb/searchdata.cpp -${rcltop}/rcldb/stemdb.cpp -${rcltop}/rcldb/stoplist.cpp -${rcltop}/unac/unac.c -${rcltop}/utils/base64.cpp -${rcltop}/utils/circache.cpp -${rcltop}/utils/closefrom.cpp -${rcltop}/utils/conftree.cpp -${rcltop}/utils/copyfile.cpp -${rcltop}/utils/debuglog.cpp -${rcltop}/utils/execmd.cpp -${rcltop}/utils/fstreewalk.cpp -${rcltop}/utils/idfile.cpp -${rcltop}/utils/fileudi.cpp -${rcltop}/utils/md5.cpp -${rcltop}/utils/mimeparse.cpp -${rcltop}/utils/netcon.cpp -${rcltop}/utils/pathut.cpp -${rcltop}/utils/readfile.cpp -${rcltop}/utils/smallut.cpp -${rcltop}/utils/transcode.cpp -${rcltop}/utils/wipedir.cpp -) +set(kio_recoll_SRCS kio_recoll.cpp htmlif.cpp dirif.cpp) CHECK_LIBRARY_EXISTS(dl dlopen "" DLOPEN_IN_LIBDL) IF(DLOPEN_IN_LIBDL) @@ -107,7 +52,7 @@ ENDIF(PTHREAD_IN_LIBPTHREAD) kde4_add_plugin(kio_recoll ${kio_recoll_SRCS}) -target_link_libraries(kio_recoll xapian z ${EXTRA_LIBS} ${KDE4_KIO_LIBS}) +target_link_libraries(kio_recoll rcl xapian z ${EXTRA_LIBS} ${KDE4_KIO_LIBS}) install(TARGETS kio_recoll DESTINATION ${PLUGIN_INSTALL_DIR})