adapt to the recent cmake changes

svn path=/branches/work/kde4/playground/graphics/okular/; revision=540372
20 years ago · f8de9e780e
parent 9a2dc16b72
commit f8de9e780e
17 changed files with 30 additions and 137 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,4 +1,3 @@
-kde4_header()
 project(oKular)

 add_subdirectory( conf )
@ -7,7 +6,9 @@ add_subdirectory( ui )
 add_subdirectory( shell )
 add_subdirectory( generators )

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular/ui/painter_agg2/ )
+include_directories(
+   ${CMAKE_SOURCE_DIR}/okular/ui/painter_agg2/
+)


 ########### next target ###############
@ -101,8 +102,6 @@ kde4_install_icons( ${ICON_INSTALL_DIR}  hicolor )



-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/conf/CMakeLists.txt
+++ b/conf/CMakeLists.txt
@ -1,9 +1,5 @@
-kde4_header()
-
 install_files( ${KCFG_INSTALL_DIR} FILES  oKular.kcfg )

-kde4_footer()
-
 #original Makefile.am contents follow:

 #INCLUDES = -I$(srcdir)/.. -I$(top_builddir)/kpdf $(all_includes)
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@ -1,9 +1,5 @@
-kde4_header()
-
 install_files( ${SERVICETYPES_INSTALL_DIR} FILES  oKularGenerator.desktop )

-kde4_footer()
-
 #original Makefile.am contents follow:

 #SUBDIRS = .
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@ -1,5 +1,3 @@
-kde4_header()
-
 # let's enable the generators properly configured

 if(POPPLER_FOUND)
@ -14,8 +12,6 @@ if(CHM_FOUND)
  add_subdirectory( chm )
 endif(CHM_FOUND)

-kde4_footer()
-
 #original Makefile.am contents follow:

 #if include_ghostscript
--- a/generators/chm/CMakeLists.txt
+++ b/generators/chm/CMakeLists.txt
@ -1,9 +1,11 @@
-kde4_header()
-
-#add_subdirectory( lib )
 add_subdirectory( kio-msits )

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular ${CMAKE_BINARY_DIR}/okular ${CHM_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/okular/generators/chm/lib )
+include_directories(
+   ${CMAKE_SOURCE_DIR}/okular
+   ${CMAKE_BINARY_DIR}/okular
+   ${CHM_INCLUDE_DIR}
+   ${CMAKE_SOURCE_DIR}/okular/generators/chm/lib
+)


 ########### next target ###############
@ -37,8 +39,6 @@ install_targets(${PLUGIN_INSTALL_DIR} okularGenerator_chmlib )

 install_files( ${SERVICES_INSTALL_DIR} FILES  libokularGenerator_chmlib.desktop )

-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/generators/chm/kio-msits/CMakeLists.txt
+++ b/generators/chm/kio-msits/CMakeLists.txt
@ -1,6 +1,7 @@
-kde4_header()
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular ${CHM_INCLUDE_DIR} )
+include_directories(
+   ${CMAKE_SOURCE_DIR}/okular
+   ${CHM_INCLUDE_DIR}
+)


 ########### next target ###############
@ -22,8 +23,6 @@ install_targets(${PLUGIN_INSTALL_DIR} kio_msits )

 install_files( ${SERVICES_INSTALL_DIR} FILES  msits.protocol )

-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/generators/chm/lib/CMakeLists.txt
+++ b/generators/chm/lib/CMakeLists.txt
@ -1,25 +0,0 @@
-kde4_header()
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
-
-
-########### next target ###############
-
-
-########### install files ###############
-
-
-kde4_footer()
-
-
-
-#original Makefile.am contents follow:
-
-#noinst_LTLIBRARIES = libchmfile.la
-#
-#INCLUDES = -I$(srcdir)/../.. -I$(top_builddir)/kpdf $(all_includes)
-#
-#libchmfile_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) 
-#libchmfile_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_QT) -lchm 
-#libchmfile_la_SOURCES = kchmtextencoding.cpp xchmfile.cpp iconstorage.cpp kchmurl.cpp kchmtreeviewitem.cpp
-#
--- a/generators/fax/CMakeLists.txt
+++ b/generators/fax/CMakeLists.txt
@ -1,8 +1,10 @@
-kde4_header()
-
 add_subdirectory( libkfaximage )

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular ${CMAKE_BINARY_DIR}/okular ${CMAKE_SOURCE_DIR}/okular/generators/fax/libkfaximage )
+include_directories(
+   ${CMAKE_SOURCE_DIR}/okular
+   ${CMAKE_BINARY_DIR}/okular
+   ${CMAKE_CURRENT_SOURCE_DIR}/libkfaximage
+)


 ########### next target ###############
--- a/generators/fax/libkfaximage/CMakeLists.txt
+++ b/generators/fax/libkfaximage/CMakeLists.txt
@ -1,6 +1,3 @@
-kde4_header()
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} )


 ########### next target ###############
@ -21,8 +18,6 @@ install_targets(${LIB_INSTALL_DIR} kfaximage )

 install_files( /include FILES  kfaximage.h )

-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/generators/ghostview/CMakeLists.txt
+++ b/generators/ghostview/CMakeLists.txt
@ -1,8 +1,9 @@
-kde4_header()
-
 add_subdirectory( conf ) 

-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_SOURCE_DIR}/okular ${CMAKE_CURRENT_BINARY_DIR}/../..  )
+include_directories(
+   ${CMAKE_SOURCE_DIR}/okular
+   ${CMAKE_CURRENT_BINARY_DIR}/../..
+)


 ########### next target ###############
@ -44,8 +45,6 @@ install_targets(${PLUGIN_INSTALL_DIR} okularGenerator_ghostview )

 install_files( ${SERVICES_INSTALL_DIR} FILES  libokularGenerator_ghostview.desktop )

-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/generators/ghostview/conf/CMakeLists.txt
+++ b/generators/ghostview/conf/CMakeLists.txt
@ -1,17 +1,6 @@
-kde4_header()
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
-
-
-########### next target ###############
-
-
-########### install files ###############

 install_files( ${KCFG_INSTALL_DIR} FILES  gssettings.kcfg )

-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/generators/kimgio/CMakeLists.txt
+++ b/generators/kimgio/CMakeLists.txt
@ -1,6 +1,6 @@
-kde4_header()
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular )
+include_directories(
+   ${CMAKE_SOURCE_DIR}/okular
+)


 ########### next target ###############
@ -22,8 +22,6 @@ install_targets(${PLUGIN_INSTALL_DIR} okularGenerator_kimgio )

 install_files( ${SERVICES_INSTALL_DIR} FILES  libokularGenerator_kimgio.desktop )

-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/generators/poppler/CMakeLists.txt
+++ b/generators/poppler/CMakeLists.txt
@ -1,6 +1,8 @@
-kde4_header()
-
-include_directories( ${POPPLER_INCLUDE_DIR}/poppler ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../.. ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular )
+include_directories(
+   ${POPPLER_INCLUDE_DIR}/poppler
+   ${CMAKE_BINARY_DIR}/okular
+   ${CMAKE_SOURCE_DIR}/okular
+)


 ########### next target ###############
@ -22,8 +24,6 @@ install_targets(${PLUGIN_INSTALL_DIR} okularGenerator_poppler )

 install_files( ${SERVICES_INSTALL_DIR} FILES  libokularGenerator_poppler.desktop )

-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/shell/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@ -1,7 +1,3 @@
-kde4_header()
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}  )
-

 ########### next target ###############

@ -21,8 +17,6 @@ install_targets(/bin oKular )
 install_files( ${XDG_APPS_DIR} FILES  oKular.desktop )
 install_files( ${DATA_INSTALL_DIR}/oKular FILES  shell.rc )

-kde4_footer()
-


 #original Makefile.am contents follow:
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@ -1,9 +1,4 @@
-kde4_header()
-
 add_subdirectory( data )
-#add_subdirectory( painter_agg2 )
-
-kde4_footer()

 #original Makefile.am contents follow:

--- a/ui/data/CMakeLists.txt
+++ b/ui/data/CMakeLists.txt
@ -1,5 +1,3 @@
-kde4_header()
-
 # install annotator xml tools description
 install_files(${DATA_INSTALL_DIR}/oKular FILES
   tools.xml
@ -38,8 +36,6 @@ install_files(${DATA_INSTALL_DIR}/oKular/pics FILES
   ghns_star_gray.png
 )

-kde4_footer()
-
 #original Makefile.am contents follow:

 ## install annotation tool images
--- a/ui/painter_agg2/CMakeLists.txt
+++ b/ui/painter_agg2/CMakeLists.txt
@ -1,36 +0,0 @@
-kde4_header()
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
-
-
-########### next target ###############
-
-
-########### install files ###############
-
-
-kde4_footer()
-
-
-
-#original Makefile.am contents follow:
-
-##INCLUDES = -I$(srcdir)/.. -I$(top_builddir)/kpdf $(all_includes)
-#
-##SUBDIRS = ctrl . platform
-#INCLUDES = -I.
-##-I$(top_srcdir)/include
-#
-#noinst_LTLIBRARIES = libagg2.la
-#libagg2_la_SOURCES = agg_path_storage.cpp agg_vcgen_stroke.cpp agg_rasterizer_scanline_aa.cpp agg_bezier_arc.cpp \
-#                     agg_trans_affine.cpp
-#
-## agg_arc.cpp agg_arrowhead.cpp agg_bezier_arc.cpp agg_bspline.cpp agg_curves.cpp \
-## agg_vcgen_bspline.cpp agg_vcgen_contour.cpp agg_vcgen_dash.cpp agg_vcgen_markers_term.cpp \
-## agg_vcgen_smooth_poly1.cpp agg_vcgen_stroke.cpp agg_gsv_text.cpp agg_image_filters.cpp \
-## agg_path_storage.cpp agg_rasterizer_scanline_aa.cpp agg_line_aa_basics.cpp agg_line_profile_aa.cpp \
-## agg_rounded_rect.cpp agg_sqrt_tables.cpp agg_embedded_raster_fonts.cpp agg_trans_affine.cpp \
-## agg_trans_single_path.cpp agg_trans_double_path.cpp \
-## agg_trans_warp_magnifier.cpp agg_vpgen_clip_polygon.cpp agg_vpgen_clip_polyline.cpp \
-## agg_vpgen_segmentator.cpp
-##libagg_la_LIBADD = $(top_builddir)/gpc/libagggpc.la $(top_builddir)/src/ctrl/libaggctrl.la