From 3d62f697b208d346058046142e9b824a32fa611e Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 25 Jul 2006 13:08:23 +0000 Subject: [PATCH] Clean up svn path=/trunk/playground/graphics/okular/; revision=566117 --- CMakeLists.txt | 2 +- generators/CMakeLists.txt | 2 +- generators/chm/CMakeLists.txt | 2 +- generators/chm/kio-msits/CMakeLists.txt | 2 +- generators/djvu/CMakeLists.txt | 2 +- generators/dvi/CMakeLists.txt | 2 +- generators/fax/CMakeLists.txt | 2 +- generators/ghostview/CMakeLists.txt | 2 +- generators/kimgio/CMakeLists.txt | 2 +- generators/poppler/CMakeLists.txt | 2 +- generators/tiff/CMakeLists.txt | 2 +- shell/CMakeLists.txt | 4 ++-- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be963c632..da36dcd73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ kde4_add_plugin(okularpart WITH_PREFIX ${okularpart_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularpart ) -target_link_libraries(okularpart okularcore ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KNEWSTUFF_LIBS} ${KDE4_KHTML_LIBS} m ${X11_Xrender_LIB} ) +target_link_libraries(okularpart okularcore ${KDE4_KPARTS_LIBS} ${KDE4_KDEPRINT_LIBS} ${KDE4_KNEWSTUFF_LIBS} ${KDE4_KHTML_LIBS} m ${X11_Xrender_LIB} ) install(TARGETS okularpart DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt index d41993f3b..57fbe1fd3 100644 --- a/generators/CMakeLists.txt +++ b/generators/CMakeLists.txt @@ -1,7 +1,7 @@ # let's enable the generators properly configured if(POPPLER_FOUND) - add_subdirectory(poppler) + #add_subdirectory(poppler) endif(POPPLER_FOUND) if(LIBGS_FOUND) add_subdirectory(ghostview) diff --git a/generators/chm/CMakeLists.txt b/generators/chm/CMakeLists.txt index e25ed211c..75c470e22 100644 --- a/generators/chm/CMakeLists.txt +++ b/generators/chm/CMakeLists.txt @@ -30,7 +30,7 @@ kde4_add_plugin(okularGenerator_chmlib WITH_PREFIX ${okularGenerator_chmlib_PART kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_chmlib ) -target_link_libraries(okularGenerator_chmlib ${KDE4_KDECORE_LIBS} okularcore ${CHM_LIBRARY} ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ) +target_link_libraries(okularGenerator_chmlib okularcore ${CHM_LIBRARY} ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KHTML_LIBS} ) install(TARGETS okularGenerator_chmlib DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/generators/chm/kio-msits/CMakeLists.txt b/generators/chm/kio-msits/CMakeLists.txt index c18dceff4..372533244 100644 --- a/generators/chm/kio-msits/CMakeLists.txt +++ b/generators/chm/kio-msits/CMakeLists.txt @@ -14,7 +14,7 @@ kde4_add_plugin(kio_msits ${kio_msits_PART_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kio_msits ) -target_link_libraries(kio_msits ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${CHM_LIBRARY} ) +target_link_libraries(kio_msits ${KDE4_KIO_LIBS} ${CHM_LIBRARY} ) install(TARGETS kio_msits DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/generators/djvu/CMakeLists.txt b/generators/djvu/CMakeLists.txt index f96861f1b..418f6ff0d 100644 --- a/generators/djvu/CMakeLists.txt +++ b/generators/djvu/CMakeLists.txt @@ -18,7 +18,7 @@ kde4_add_plugin(okularGenerator_djvu WITH_PREFIX ${okularGenerator_djvu_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_djvu ) -target_link_libraries(okularGenerator_djvu ${KDE4_KDECORE_LIBS} okularcore ${DJVULIBRE_LIBRARY} ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} ) +target_link_libraries(okularGenerator_djvu okularcore ${DJVULIBRE_LIBRARY} ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} ) install(TARGETS okularGenerator_djvu DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/generators/dvi/CMakeLists.txt b/generators/dvi/CMakeLists.txt index 74c468e19..56bdcfb88 100644 --- a/generators/dvi/CMakeLists.txt +++ b/generators/dvi/CMakeLists.txt @@ -44,7 +44,7 @@ kde4_add_plugin(okularGenerator_dvi WITH_PREFIX ${okularGenerator_dvi_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_dvi ) -target_link_libraries(okularGenerator_dvi ${KDE4_KDECORE_LIBS} okularcore m ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} ) +target_link_libraries(okularGenerator_dvi okularcore m ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} ) install(TARGETS okularGenerator_dvi DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/generators/fax/CMakeLists.txt b/generators/fax/CMakeLists.txt index 6211cd56c..2939fe685 100644 --- a/generators/fax/CMakeLists.txt +++ b/generators/fax/CMakeLists.txt @@ -17,7 +17,7 @@ kde4_add_plugin(okularGenerator_fax WITH_PREFIX ${okularGenerator_fax_PART_SRCS} kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_fax ) -target_link_libraries(okularGenerator_fax ${KDE4_KDECORE_LIBS} okularcore ${KDE4_KDEUI_LIBS} kfaximage ) +target_link_libraries(okularGenerator_fax okularcore ${KDE4_KDEUI_LIBS} kfaximage ) install(TARGETS okularGenerator_fax DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/generators/ghostview/CMakeLists.txt b/generators/ghostview/CMakeLists.txt index c498908d1..65c66ca2d 100644 --- a/generators/ghostview/CMakeLists.txt +++ b/generators/ghostview/CMakeLists.txt @@ -20,7 +20,7 @@ kde4_add_executable(okulargsasyncgenerator ${okulargsasyncgenerator_SRCS}) target_link_libraries(okulargsasyncgenerator ${KDE4_KDECORE_LIBS} qgs ) -install(TARGETS okulargsasyncgenerator DESTINATION bin) +install(TARGETS okulargsasyncgenerator DESTINATION ${BIN_INSTALL_DIR}) ########### next target ############### diff --git a/generators/kimgio/CMakeLists.txt b/generators/kimgio/CMakeLists.txt index 92244daf9..0236e0d8a 100644 --- a/generators/kimgio/CMakeLists.txt +++ b/generators/kimgio/CMakeLists.txt @@ -13,7 +13,7 @@ kde4_add_plugin(okularGenerator_kimgio WITH_PREFIX ${okularGenerator_kimgio_PART kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_kimgio ) -target_link_libraries(okularGenerator_kimgio ${KDE4_KDECORE_LIBS} okularcore ${KDE4_KDEUI_LIBS} ) +target_link_libraries(okularGenerator_kimgio okularcore ${KDE4_KDEUI_LIBS} ) install(TARGETS okularGenerator_kimgio DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt index 473073730..f2e5db60f 100644 --- a/generators/poppler/CMakeLists.txt +++ b/generators/poppler/CMakeLists.txt @@ -15,7 +15,7 @@ kde4_add_plugin(okularGenerator_poppler WITH_PREFIX ${okularGenerator_poppler_PA kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_poppler ) -target_link_libraries(okularGenerator_poppler ${POPPLER_LIBRARY} ${KDE4_KDECORE_LIBS} okularcore ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} m ) +target_link_libraries(okularGenerator_poppler ${POPPLER_LIBRARY} okularcore ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} m ) install(TARGETS okularGenerator_poppler DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/generators/tiff/CMakeLists.txt b/generators/tiff/CMakeLists.txt index b0be53ea8..e070ecded 100644 --- a/generators/tiff/CMakeLists.txt +++ b/generators/tiff/CMakeLists.txt @@ -16,7 +16,7 @@ kde4_add_plugin(okularGenerator_tiff WITH_PREFIX ${okularGenerator_tiff_SRCS}) kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_tiff ) -target_link_libraries(okularGenerator_tiff ${KDE4_KDECORE_LIBS} okularcore ${TIFF_LIBRARIES} ${KDE4_KDEUI_LIBS} ) +target_link_libraries(okularGenerator_tiff okularcore ${TIFF_LIBRARIES} ${KDE4_KDEUI_LIBS} ) install(TARGETS okularGenerator_tiff DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt index aff6ad17c..5b91bb5c0 100644 --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -7,9 +7,9 @@ kde4_automoc(${okular_SRCS}) kde4_add_executable(okular ${okular_SRCS}) -target_link_libraries(okular ${KDE4_KDECORE_LIBS} ${KDE4_KPARTS_LIBS} ) +target_link_libraries(okular ${KDE4_KPARTS_LIBS} ) -install(TARGETS okular DESTINATION bin) +install(TARGETS okular DESTINATION ${BIN_INSTALL_DIR}) ########### install files ###############