summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cervisia/CMakeLists.txt18
-rw-r--r--cervisia/cvsservice/CMakeLists.txt2
-rw-r--r--kapptemplate/CMakeLists.txt4
-rw-r--r--kapptemplate/admin/CMakeLists.txt7
-rw-r--r--kapptemplate/admin/Makefile.am4
-rw-r--r--kmtrace/CMakeLists.txt6
-rw-r--r--kompare/interfaces/CMakeLists.txt1
-rw-r--r--kunittest/CMakeLists.txt1
-rw-r--r--scheck/CMakeLists.txt2
-rw-r--r--scripts/CMakeLists.txt2
-rw-r--r--tdecachegrind/tdecachegrind/CMakeLists.txt2
11 files changed, 41 insertions, 8 deletions
diff --git a/cervisia/CMakeLists.txt b/cervisia/CMakeLists.txt
index 620cb602..b4f6f7c3 100644
--- a/cervisia/CMakeLists.txt
+++ b/cervisia/CMakeLists.txt
@@ -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
diff --git a/cervisia/cvsservice/CMakeLists.txt b/cervisia/cvsservice/CMakeLists.txt
index b445994f..cfb739cf 100644
--- a/cervisia/cvsservice/CMakeLists.txt
+++ b/cervisia/cvsservice/CMakeLists.txt
@@ -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 tdecore-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kapptemplate/CMakeLists.txt b/kapptemplate/CMakeLists.txt
index 399917a9..1be17f9c 100644
--- a/kapptemplate/CMakeLists.txt
+++ b/kapptemplate/CMakeLists.txt
@@ -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
diff --git a/kapptemplate/admin/CMakeLists.txt b/kapptemplate/admin/CMakeLists.txt
index 8b0806d2..56076c9f 100644
--- a/kapptemplate/admin/CMakeLists.txt
+++ b/kapptemplate/admin/CMakeLists.txt
@@ -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
+)
diff --git a/kapptemplate/admin/Makefile.am b/kapptemplate/admin/Makefile.am
index fef6965c..16847934 100644
--- a/kapptemplate/admin/Makefile.am
+++ b/kapptemplate/admin/Makefile.am
@@ -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 \
diff --git a/kmtrace/CMakeLists.txt b/kmtrace/CMakeLists.txt
index 600391b7..c2551b0e 100644
--- a/kmtrace/CMakeLists.txt
+++ b/kmtrace/CMakeLists.txt
@@ -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
)
diff --git a/kompare/interfaces/CMakeLists.txt b/kompare/interfaces/CMakeLists.txt
index bd6583e2..91385890 100644
--- a/kompare/interfaces/CMakeLists.txt
+++ b/kompare/interfaces/CMakeLists.txt
@@ -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}
)
diff --git a/kunittest/CMakeLists.txt b/kunittest/CMakeLists.txt
index 6b3aefd5..8eb4cae0 100644
--- a/kunittest/CMakeLists.txt
+++ b/kunittest/CMakeLists.txt
@@ -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}
)
diff --git a/scheck/CMakeLists.txt b/scheck/CMakeLists.txt
index bef3a460..365f7a84 100644
--- a/scheck/CMakeLists.txt
+++ b/scheck/CMakeLists.txt
@@ -30,5 +30,5 @@ install( FILES scheck.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes )
tde_add_kpart( scheck AUTOMOC
SOURCES scheck.cpp
LINK tdeui-shared
- DESTINATION ${PLUGIN_INSTALL_DIR}
+ DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles
)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 6ed8ca84..ed06d49d 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -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()
diff --git a/tdecachegrind/tdecachegrind/CMakeLists.txt b/tdecachegrind/tdecachegrind/CMakeLists.txt
index cd284c36..1e5ff51c 100644
--- a/tdecachegrind/tdecachegrind/CMakeLists.txt
+++ b/tdecachegrind/tdecachegrind/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
tde_install_icons( )
install( FILES tdecachegrind.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES tdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/kcachegrind )
+install( FILES tdecachegrindui.rc tips DESTINATION ${DATA_INSTALL_DIR}/tdecachegrind )
install( FILES x-tdecachegrind.desktop DESTINATION ${MIME_INSTALL_DIR}/application )