Attachment #960 for bug #1262

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 1262
Collapse All | Expand All




  DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )


macro( _pod2man )
  foreach( _pod ${ARGN} )
    add_custom_command(
      OUTPUT ${_pod}.1
      COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod}.pod > ${_pod}.1.in
      COMMAND
        sed -e 's%_KDEHTMLDIR_%'${HTML_INSTALL_DIR}'%g;'
            -e 's%_KDECONFDIR_%'${CONFIG_INSTALL_DIR}'%g;'
            < ${_pod}.1.in > ${_pod}.1
      DEPENDS ${_pod} )
    add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )
    install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
  endforeach( )
endmacro()

_pod2man( cervisia )


##### cervisia (static) #########################

tde_add_library( cervisia STATIC_PIC AUTOMOC

Lines 41-47 install( FILES Link Here

(-)a/cervisia/cvsservice/CMakeLists.txt (-1 / +1 lines)
41	tde_add_library( cvsservice SHARED AUTOMOC	41	tde_add_library( cvsservice SHARED AUTOMOC
42	SOURCES	42	SOURCES
43	cvsservice.stub cvsjob.stub repository.stub	43	cvsservice.stub cvsjob.stub repository.stub
44	VERSION 0.1.0	44	VERSION 0.0.1
45	LINK tdecore-shared	45	LINK tdecore-shared
46	DESTINATION ${LIB_INSTALL_DIR}	46	DESTINATION ${LIB_INSTALL_DIR}
47	)	47	)

Lines 23-28 configure_file( kapptemplate.cmake kapptemplate @ONLY ) Link Here

(-)a/kapptemplate/CMakeLists.txt (+4 lines)
23		23
24	install( PROGRAMS	24	install( PROGRAMS
25	${CMAKE_CURRENT_BINARY_DIR}/kapptemplate	25	${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
		26	DESTINATION ${BIN_INSTALL_DIR} )
		27
		28	install( PROGRAMS
		29	${CMAKE_CURRENT_SOURCE_DIR}/mkinstalldirs
26	DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )	30	DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
27		31
28	install( FILES	32	install( FILES

Lines 9-12 Link Here

(-)a/kapptemplate/admin/CMakeLists.txt (-1 / +6 lines)
9	#	9	#
10	#################################################	10	#################################################
11		11
12	tde_install_empty_directory( ${DATA_INSTALL_DIR}/kapptemplate/admin )	12	install(
		13	DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../admin/
		14	DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/admin
		15	USE_SOURCE_PERMISSIONS
		16	REGEX "Makefile(\|\\.in\|\\.am)$\|.*-orig$" EXCLUDE
		17	)

Lines 1-8 Link Here

(-)a/kapptemplate/admin/Makefile.am (-2 / +2 lines)
1	install-data-local:	1	install-data-local:
2	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin	2	$(mkinstalldirs) $(DESTDIR)$(kde_datadir)/kapptemplate/admin
3	for file in $(srcdir)/*; do \	3	for file in $(srcdir)/*; do \
4	if [ -f $$file -a $$file != 'Makefile' -a $$file != 'Makefile.in' -a $$file != 'Makefile.am' ]; then \	4	destfile=`basename $$file`; \
5	destfile=`basename $$file` \	5	if [ -f $$file -a $$destfile != 'Makefile' -a $$destfile != 'Makefile.in' -a $$destfile != 'Makefile.am' ]; then \
6	$(INSTALL_DATA) $$file \	6	$(INSTALL_DATA) $$file \
7	$(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \	7	$(DESTDIR)$(kde_datadir)/kapptemplate/admin/$$destfile; \
8	fi \	8	fi \




install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kminspector
  DESTINATION ${BIN_INSTALL_DIR} )

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


##### ktrace_s (static) #########################

tde_add_library( ktrace_s STATIC
  SOURCES ktrace.c
  DESTINATION ${LIB_INSTALL_DIR}/kmtrace
)



Lines 23-28 link_directories( Link Here

(-)a/kompare/interfaces/CMakeLists.txt (+1 lines)
23		23
24	tde_add_library( kompareinterface SHARED	24	tde_add_library( kompareinterface SHARED
25	SOURCES kompareinterface.cpp	25	SOURCES kompareinterface.cpp
		26	VERSION 0.0.0
26	LINK ${TQT_LIBRARIES}	27	LINK ${TQT_LIBRARIES}
27	DESTINATION ${LIB_INSTALL_DIR}	28	DESTINATION ${LIB_INSTALL_DIR}
28	)	29	)

Lines 35-40 install( PROGRAMS Link Here

(-)a/kunittest/CMakeLists.txt (+1 lines)
35		35
36	tde_add_library( kunittestgui SHARED AUTOMOC	36	tde_add_library( kunittestgui SHARED AUTOMOC
37	SOURCES testerwidget.ui runnergui.cpp dcopinterface.skel	37	SOURCES testerwidget.ui runnergui.cpp dcopinterface.skel
		38	VERSION 0.0.0
38	LINK kunittest-shared	39	LINK kunittest-shared
39	DESTINATION ${LIB_INSTALL_DIR}	40	DESTINATION ${LIB_INSTALL_DIR}
40	)	41	)

Lines 30-34 install( FILES scheck.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes ) Link Here

(-)a/scheck/CMakeLists.txt (-1 / +1 lines)
30	tde_add_kpart( scheck AUTOMOC	30	tde_add_kpart( scheck AUTOMOC
31	SOURCES scheck.cpp	31	SOURCES scheck.cpp
32	LINK tdeui-shared	32	LINK tdeui-shared
33	DESTINATION ${PLUGIN_INSTALL_DIR}	33	DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
34	)	34	)

Lines 36-42 macro( _pod2man ) Link Here

(-)a/scripts/CMakeLists.txt (-1 / +1 lines)
36	COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod} > ${_pod}.1	36	COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod} > ${_pod}.1
37	DEPENDS ${_pod} )	37	DEPENDS ${_pod} )
38	add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )	38	add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )
39	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR} )	39	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
40	endforeach( )	40	endforeach( )
41	endmacro()	41	endmacro()
42		42

Lines 26-32 link_directories( Link Here

(-)a/tdecachegrind/tdecachegrind/CMakeLists.txt (-1 / +1 lines)
26		26
27	tde_install_icons( )	27	tde_install_icons( )
28	install( FILES tdecachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )	28	install( FILES tdecachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
29	install( FILES tdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )	29	install( FILES tdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/tdecachegrind )
30	install( FILES x-tdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )	30	install( FILES x-tdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )
31		31
32		32

Return to bug 1262

Lines 58-63 install( PROGRAMS Link Here

(-)a/cervisia/CMakeLists.txt (+18 lines)
58	DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )	58	DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
59		59
60		60
		61	macro( _pod2man )
		62	foreach( _pod ${ARGN} )
		63	add_custom_command(
		64	OUTPUT ${_pod}.1
		65	COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod}.pod > ${_pod}.1.in
		66	COMMAND
		67	sed -e 's%_KDEHTMLDIR_%'${HTML_INSTALL_DIR}'%g;'
		68	-e 's%_KDECONFDIR_%'${CONFIG_INSTALL_DIR}'%g;'
		69	< ${_pod}.1.in > ${_pod}.1
		70	DEPENDS ${_pod} )
		71	add_custom_target( "${_pod}-man" ALL DEPENDS ${_pod}.1 )
		72	install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
		73	endforeach( )
		74	endmacro()
		75
		76	_pod2man( cervisia )
		77
		78
61	##### cervisia (static) #########################	79	##### cervisia (static) #########################
62		80
63	tde_add_library( cervisia STATIC_PIC AUTOMOC	81	tde_add_library( cervisia STATIC_PIC AUTOMOC

Lines 31-42 install( FILES kde.excludes Link Here

(-)a/kmtrace/CMakeLists.txt (-1 / +5 lines)
31	install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kminspector	31	install( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kminspector
32	DESTINATION ${BIN_INSTALL_DIR} )	32	DESTINATION ${BIN_INSTALL_DIR} )
33		33
		34	install( FILES ktrace.h
		35	DESTINATION ${INCLUDE_INSTALL_DIR}
		36	)
		37
34		38
35	##### ktrace_s (static) #########################	39	##### ktrace_s (static) #########################
36		40
37	tde_add_library( ktrace_s STATIC	41	tde_add_library( ktrace_s STATIC
38	SOURCES ktrace.c	42	SOURCES ktrace.c
39	DESTINATION ${LIB_INSTALL_DIR}	43	DESTINATION ${LIB_INSTALL_DIR}/kmtrace
40	)	44	)
41		45
42		46