Fix various cmake build issues

Fix automake build issue in kapptemplate
(cherry picked from commit 3dd9fca200)
v3.5.13-sru
Slávek Banko 12 years ago
parent 3d23aba4df
commit 16dfe83e60

@ -58,6 +58,24 @@ install( PROGRAMS
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}.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

@ -41,7 +41,7 @@ install( FILES
tde_add_library( cvsservice SHARED AUTOMOC
SOURCES
cvsservice.stub cvsjob.stub repository.stub
VERSION 0.1.0
VERSION 0.0.1
LINK kdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)

@ -23,6 +23,10 @@ configure_file( kapptemplate.cmake kapptemplate @ONLY )
install( PROGRAMS
${CMAKE_CURRENT_BINARY_DIR}/kapptemplate
DESTINATION ${BIN_INSTALL_DIR} )
install( PROGRAMS
${CMAKE_CURRENT_SOURCE_DIR}/mkinstalldirs
DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/bin )
install( FILES

@ -9,4 +9,9 @@
#
#################################################
tde_install_empty_directory( ${DATA_INSTALL_DIR}/kapptemplate/admin )
install(
DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../../admin/
DESTINATION ${DATA_INSTALL_DIR}/kapptemplate/admin
USE_SOURCE_PERMISSIONS
REGEX "Makefile(|\\.in|\\.am)$|.*-orig$" EXCLUDE
)

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

@ -31,12 +31,16 @@ install( FILES kde.excludes
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}
DESTINATION ${LIB_INSTALL_DIR}/kmtrace
)

@ -23,6 +23,7 @@ link_directories(
tde_add_library( kompareinterface SHARED
SOURCES kompareinterface.cpp
VERSION 0.0.0
LINK ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)

@ -35,6 +35,7 @@ install( PROGRAMS
tde_add_library( kunittestgui SHARED AUTOMOC
SOURCES testerwidget.ui runnergui.cpp dcopinterface.skel
VERSION 0.0.0
LINK kunittest-shared
DESTINATION ${LIB_INSTALL_DIR}
)

@ -30,5 +30,5 @@ install( FILES scheck.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
tde_add_kpart( scheck AUTOMOC
SOURCES scheck.cpp
LINK kdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)

@ -36,7 +36,7 @@ macro( _pod2man )
COMMAND pod2man ${CMAKE_CURRENT_SOURCE_DIR}/${_pod} > ${_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} )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_pod}.1 DESTINATION ${MAN_INSTALL_DIR}/man1 )
endforeach( )
endmacro()

Loading…
Cancel
Save