Attachment #1401 for bug #1593

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1593
Collapse All | Expand All

Lines 118-123 if( BUILD_TDEFILE_PLUGINS AND NOT BUILD_KGHOSTVIEW ) Link Here

(-)a/CMakeLists.txt (-1 / +6 lines)
118	add_subdirectory( kghostview/dscparse )	118	add_subdirectory( kghostview/dscparse )
119	endif( )	119	endif( )
120		120
		121	# kdvi and kfax require one small static library from kviewshell
		122	# see BUG 1593 for detals
		123	if( BUILD_KVIEWSHELL OR BUILD_KDVI OR BUILD_KFAX )
		124	add_subdirectory( kviewshell )
		125	endif( )
		126
121	tde_conditional_add_subdirectory( BUILD_DOC doc )	127	tde_conditional_add_subdirectory( BUILD_DOC doc )
122	tde_conditional_add_subdirectory( BUILD_KAMERA kamera )	128	tde_conditional_add_subdirectory( BUILD_KAMERA kamera )
123	tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit )	129	tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit )
Lines 138-144 tde_conditional_add_subdirectory( BUILD_KSNAPSHOT ksnapshot ) Link Here
138	tde_conditional_add_subdirectory( BUILD_KSVG ksvg )	144	tde_conditional_add_subdirectory( BUILD_KSVG ksvg )
139	tde_conditional_add_subdirectory( BUILD_KUICKSHOW kuickshow )	145	tde_conditional_add_subdirectory( BUILD_KUICKSHOW kuickshow )
140	tde_conditional_add_subdirectory( BUILD_KVIEW kview )	146	tde_conditional_add_subdirectory( BUILD_KVIEW kview )
141	tde_conditional_add_subdirectory( BUILD_KVIEWSHELL kviewshell )
142	tde_conditional_add_subdirectory( BUILD_LIBKSCAN libkscan )	147	tde_conditional_add_subdirectory( BUILD_LIBKSCAN libkscan )
143		148
144		149





project( kviewshell )

add_subdirectory( pics )
add_subdirectory( plugins )

include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${CMAKE_CURRENT_SOURCE_DIR}

)


##### kviewshell (static) #######################
# we need this library for kdvi and kfax
tde_add_library( kviewshell STATIC_PIC AUTOMOC
  SOURCES
    kviewshell.cpp
)

install( FILES
    tdemultipageInterface.h
  DESTINATION ${INCLUDE_INSTALL_DIR} )

##### kviewshell itself #########################
if ( BUILD_KVIEWSHELL )
    documentRenderer.h documentWidget.h history.h hyperlink.h
    tdemultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h
    renderedDocumentPagePixmap.h renderedDocumentPagePrinter.h
    selection.h simplePageSize.h textBox.h zoom.h zoomlimits.h
  DESTINATION ${INCLUDE_INSTALL_DIR}/kviewshell )

  add_subdirectory( pics )
  add_subdirectory( plugins )

##### ifaces (static) ###########################
  tde_add_library( ifaces STATIC_PIC AUTOMOC
    SOURCES
      kviewpart_iface.cpp
  )

install( FILES kviewshell.rc DESTINATION ${DATA_INSTALL_DIR}/kviewshell )
install( FILES kviewerpart.rc DESTINATION ${DATA_INSTALL_DIR}/kviewerpart )
install( FILES tdemultipage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES emptymultipage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES kviewshell.kcfg DESTINATION ${KCFG_INSTALL_DIR} )

##### headers ###################################

  install( FILES
      tdemultipageInterface.h
    DESTINATION ${INCLUDE_INSTALL_DIR} )

  install( FILES
      anchor.h bookmark.h pageView.h documentPageCache.h
      documentRenderer.h documentWidget.h history.h hyperlink.h
      tdemultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h
      renderedDocumentPagePixmap.h renderedDocumentPagePrinter.h
      selection.h simplePageSize.h textBox.h zoom.h zoomlimits.h
    DESTINATION ${INCLUDE_INSTALL_DIR}/kviewshell )


##### other data ################################

  install( FILES kviewshell.rc DESTINATION ${DATA_INSTALL_DIR}/kviewshell )
  install( FILES kviewerpart.rc DESTINATION ${DATA_INSTALL_DIR}/kviewerpart )
  install( FILES tdemultipage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
  install( FILES emptymultipage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
  install( FILES kviewshell.kcfg DESTINATION ${KCFG_INSTALL_DIR} )


##### tdemultipage (shared) #######################

  tde_add_library( tdemultipage SHARED AUTOMOC
    SOURCES
      tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel
      units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp
      renderedDocumentPagePixmap.cpp renderedDocumentPagePrinter.cpp
      documentPageCache.cpp documentWidget.cpp searchWidget.cpp
      selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc
      tableOfContents.cpp kprintDialogPage_pageoptions.cpp
    VERSION 0.0.0
    LINK tdeparts-shared tdeprint-shared
    DESTINATION ${LIB_INSTALL_DIR}
  )


##### kviewerpart (module) ######################

  tde_add_kpart( kviewerpart AUTOMOC
    SOURCES
      kviewpart.cpp pageSizeWidget_base.ui pageSizeWidget.cpp
      pageSizeDialog.cpp pageSize.cpp sizePreview.cpp zoom.cpp
      units.cpp kvsprefs.kcfgc optionDialogGUIWidget_base.ui
      optionDialogAccessibilityWidget.ui simplePageSize.cpp
    LINK ifaces-static tdeparts-shared
    DESTINATION ${PLUGIN_INSTALL_DIR}
  )


##### kviewshell (executable) ##################

  tde_add_executable( kviewshell AUTOMOC
    SOURCES
      main.cpp
    LINK kviewshell-static tdeparts-shared
    DESTINATION ${BIN_INSTALL_DIR}
  )


##### emptymultipagepart (module) ###############

  tde_add_kpart( emptymultipagepart AUTOMOC
    SOURCES
      empty_multipage.cpp emptyRenderer.cpp
    LINK tdemultipage-shared
    DESTINATION ${PLUGIN_INSTALL_DIR}
  )


##### install import cmake modules ###############

  tde_install_export( )

endif( BUILD_KVIEWSHELL )

Return to bug 1593

Lines 11-19 Link Here

(-)a/kviewshell/CMakeLists.txt (-64 / +68 lines)
11		11
12	project( kviewshell )	12	project( kviewshell )
13		13
14	add_subdirectory( pics )
15	add_subdirectory( plugins )
16
17	include_directories(	14	include_directories(
18	${CMAKE_CURRENT_BINARY_DIR}	15	${CMAKE_CURRENT_BINARY_DIR}
19	${CMAKE_CURRENT_SOURCE_DIR}	16	${CMAKE_CURRENT_SOURCE_DIR}
Lines 27-121 link_directories( Link Here
27	)	24	)
28		25
29		26
30	##### headers ###################################	27	##### kviewshell (static) #######################
		28	# we need this library for kdvi and kfax
		29	tde_add_library( kviewshell STATIC_PIC AUTOMOC
		30	SOURCES
		31	kviewshell.cpp
		32	)
31		33
32	install( FILES
33	tdemultipageInterface.h
34	DESTINATION ${INCLUDE_INSTALL_DIR} )
35		34
36	install( FILES	35	##### kviewshell itself #########################
37	anchor.h bookmark.h pageView.h documentPageCache.h	36	if ( BUILD_KVIEWSHELL )
38	documentRenderer.h documentWidget.h history.h hyperlink.h
39	tdemultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h
40	renderedDocumentPagePixmap.h renderedDocumentPagePrinter.h
41	selection.h simplePageSize.h textBox.h zoom.h zoomlimits.h
42	DESTINATION ${INCLUDE_INSTALL_DIR}/kviewshell )
43		37
		38	add_subdirectory( pics )
		39	add_subdirectory( plugins )
44		40
45	##### other data ################################	41	##### ifaces (static) ###########################
		42	tde_add_library( ifaces STATIC_PIC AUTOMOC
		43	SOURCES
		44	kviewpart_iface.cpp
		45	)
46		46
47	install( FILES kviewshell.rc DESTINATION ${DATA_INSTALL_DIR}/kviewshell )
48	install( FILES kviewerpart.rc DESTINATION ${DATA_INSTALL_DIR}/kviewerpart )
49	install( FILES tdemultipage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
50	install( FILES emptymultipage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
51	install( FILES kviewshell.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
52		47
		48	##### headers ###################################
53		49
54	##### ifaces (static) ###########################	50	install( FILES
		51	tdemultipageInterface.h
		52	DESTINATION ${INCLUDE_INSTALL_DIR} )
55		53
56	tde_add_library( ifaces STATIC_PIC AUTOMOC	54	install( FILES
57	SOURCES	55	anchor.h bookmark.h pageView.h documentPageCache.h
58	kviewpart_iface.cpp	56	documentRenderer.h documentWidget.h history.h hyperlink.h
59	)	57	tdemultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h
		58	renderedDocumentPagePixmap.h renderedDocumentPagePrinter.h
		59	selection.h simplePageSize.h textBox.h zoom.h zoomlimits.h
		60	DESTINATION ${INCLUDE_INSTALL_DIR}/kviewshell )
60		61
61		62
62	##### kviewshell (static) #######################	63	##### other data ################################
63		64
64	tde_add_library( kviewshell STATIC_PIC AUTOMOC	65	install( FILES kviewshell.rc DESTINATION ${DATA_INSTALL_DIR}/kviewshell )
65	SOURCES	66	install( FILES kviewerpart.rc DESTINATION ${DATA_INSTALL_DIR}/kviewerpart )
66	kviewshell.cpp	67	install( FILES tdemultipage.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
67	)	68	install( FILES emptymultipage.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
		69	install( FILES kviewshell.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
68		70
69		71
70	##### tdemultipage (shared) #######################	72	##### tdemultipage (shared) #######################
71		73
72	tde_add_library( tdemultipage SHARED AUTOMOC	74	tde_add_library( tdemultipage SHARED AUTOMOC
73	SOURCES	75	SOURCES
74	tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel	76	tdemultipage.cpp pageView.cpp marklist.cpp tdemultipageInterface.skel
75	units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp	77	units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp
76	renderedDocumentPagePixmap.cpp renderedDocumentPagePrinter.cpp	78	renderedDocumentPagePixmap.cpp renderedDocumentPagePrinter.cpp
77	documentPageCache.cpp documentWidget.cpp searchWidget.cpp	79	documentPageCache.cpp documentWidget.cpp searchWidget.cpp
78	selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc	80	selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc
79	tableOfContents.cpp kprintDialogPage_pageoptions.cpp	81	tableOfContents.cpp kprintDialogPage_pageoptions.cpp
80	VERSION 0.0.0	82	VERSION 0.0.0
81	LINK tdeparts-shared tdeprint-shared	83	LINK tdeparts-shared tdeprint-shared
82	DESTINATION ${LIB_INSTALL_DIR}	84	DESTINATION ${LIB_INSTALL_DIR}
83	)	85	)
84		86
85		87
86	##### kviewerpart (module) ######################	88	##### kviewerpart (module) ######################
87		89
88	tde_add_kpart( kviewerpart AUTOMOC	90	tde_add_kpart( kviewerpart AUTOMOC
89	SOURCES	91	SOURCES
90	kviewpart.cpp pageSizeWidget_base.ui pageSizeWidget.cpp	92	kviewpart.cpp pageSizeWidget_base.ui pageSizeWidget.cpp
91	pageSizeDialog.cpp pageSize.cpp sizePreview.cpp zoom.cpp	93	pageSizeDialog.cpp pageSize.cpp sizePreview.cpp zoom.cpp
92	units.cpp kvsprefs.kcfgc optionDialogGUIWidget_base.ui	94	units.cpp kvsprefs.kcfgc optionDialogGUIWidget_base.ui
93	optionDialogAccessibilityWidget.ui simplePageSize.cpp	95	optionDialogAccessibilityWidget.ui simplePageSize.cpp
94	LINK ifaces-static tdeparts-shared	96	LINK ifaces-static tdeparts-shared
95	DESTINATION ${PLUGIN_INSTALL_DIR}	97	DESTINATION ${PLUGIN_INSTALL_DIR}
96	)	98	)
97		99
98		100
99	##### kviewshell (executable) ##################	101	##### kviewshell (executable) ##################
100		102
101	tde_add_executable( kviewshell AUTOMOC	103	tde_add_executable( kviewshell AUTOMOC
102	SOURCES	104	SOURCES
103	main.cpp	105	main.cpp
104	LINK kviewshell-static tdeparts-shared	106	LINK kviewshell-static tdeparts-shared
105	DESTINATION ${BIN_INSTALL_DIR}	107	DESTINATION ${BIN_INSTALL_DIR}
106	)	108	)
107		109
108		110
109	##### emptymultipagepart (module) ###############	111	##### emptymultipagepart (module) ###############
110		112
111	tde_add_kpart( emptymultipagepart AUTOMOC	113	tde_add_kpart( emptymultipagepart AUTOMOC
112	SOURCES	114	SOURCES
113	empty_multipage.cpp emptyRenderer.cpp	115	empty_multipage.cpp emptyRenderer.cpp
114	LINK tdemultipage-shared	116	LINK tdemultipage-shared
115	DESTINATION ${PLUGIN_INSTALL_DIR}	117	DESTINATION ${PLUGIN_INSTALL_DIR}
116	)	118	)
117		119
118		120
119	##### install import cmake modules ###############	121	##### install import cmake modules ###############
120		122
121	tde_install_export( )	123	tde_install_export( )
		124
		125	endif( BUILD_KVIEWSHELL )