summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-11-11 16:52:24 -0600
committerDarrell Anderson <[email protected]>2012-11-11 16:52:24 -0600
commitd71a3e005ca9c7cc50bf6b314ecea04acab0258c (patch)
tree9b8a0f3e9e8651c8016787d1a71355fa6052e2da
parentc1a8ee04fbfe9851c1f788bcdcf3a5339ce1e478 (diff)
downloadtdeutils-d71a3e005ca9c7cc50bf6b314ecea04acab0258c.tar.gz
tdeutils-d71a3e005ca9c7cc50bf6b314ecea04acab0258c.zip
Additional changes to support building with cmake.
Thanks to Slavek Banko.
-rw-r--r--CMakeLists.txt10
-rw-r--r--ark/CMakeLists.txt2
-rw-r--r--khexedit/lib/CMakeLists.txt1
-rw-r--r--khexedit/parts/kbytesedit/CMakeLists.txt2
-rw-r--r--khexedit/parts/kpart/CMakeLists.txt2
-rw-r--r--klaptopdaemon/CMakeLists.txt1
-rw-r--r--kregexpeditor/CMakeLists.txt2
-rw-r--r--kregexpeditor/KMultiFormListBox/CMakeLists.txt10
-rw-r--r--kregexpeditor/KWidgetStreamer/CMakeLists.txt8
-rw-r--r--ksim/library/CMakeLists.txt2
-rw-r--r--kwallet/konfigurator/CMakeLists.txt6
11 files changed, 41 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a7556e..9d9d5cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -127,6 +127,16 @@ option( BUILD_KWALLET "Build kwallet" ${BUILD_ALL} )
option( BUILD_SUPERKARAMBA "Build superkaramba" ${BUILD_ALL} )
+##### add apidox targets ############
+
+add_custom_target(apidox
+ COMMAND "./generate_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "/usr/share/qt3/doc/html"
+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+
+add_custom_target(install-apidox
+ COMMAND "./install_apidox" "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" "${HTML_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}"
+ WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/cmake/")
+
##### configure checks ##########################
include( ConfigureChecks.cmake )
diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt
index 4eae607..fa15179 100644
--- a/ark/CMakeLists.txt
+++ b/ark/CMakeLists.txt
@@ -45,7 +45,7 @@ tde_add_tdeinit_executable( ark AUTOMOC
##### arkpart (kpart) ###########################
-tde_add_kpart( arkpart AUTOMOC
+tde_add_kpart( libarkpart AUTOMOC
SOURCES ark_part.cpp arkfactory.cpp zip.cpp
tar.cpp filelistview.cpp arch.cpp lha.cpp
compressedfile.cpp zoo.cpp rar.cpp ar.cpp
diff --git a/khexedit/lib/CMakeLists.txt b/khexedit/lib/CMakeLists.txt
index 7d16b3d..a4b9e54 100644
--- a/khexedit/lib/CMakeLists.txt
+++ b/khexedit/lib/CMakeLists.txt
@@ -47,6 +47,7 @@ tde_add_library( khexeditcommon SHARED AUTOMOC
kcharcoltextexport.cpp
LINK tdecore-shared kcontroller-static
khecodecs-static
+ VERSION 0.0.0
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/khexedit/parts/kbytesedit/CMakeLists.txt b/khexedit/parts/kbytesedit/CMakeLists.txt
index b6d70e0..53f0cda 100644
--- a/khexedit/parts/kbytesedit/CMakeLists.txt
+++ b/khexedit/parts/kbytesedit/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
##### kbyteseditwidget (kpart) ##################
-tde_add_kpart( kbyteseditwidget AUTOMOC
+tde_add_kpart( libkbyteseditwidget AUTOMOC
SOURCES kbyteseditwidget.cpp
DESTINATION ${PLUGIN_INSTALL_DIR}
LINK khexeditcommon-shared kparts-shared
diff --git a/khexedit/parts/kpart/CMakeLists.txt b/khexedit/parts/kpart/CMakeLists.txt
index c89e1bf..af4d5b5 100644
--- a/khexedit/parts/kpart/CMakeLists.txt
+++ b/khexedit/parts/kpart/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
##### khexedit2part (kpart) #####################
-tde_add_kpart( khexedit2part AUTOMOC
+tde_add_kpart( libkhexedit2part AUTOMOC
SOURCES khepart.cpp khebrowserextension.cpp
khepartfactory.cpp
LINK khexeditcommon-shared kparts-shared
diff --git a/klaptopdaemon/CMakeLists.txt b/klaptopdaemon/CMakeLists.txt
index e0dc6f1..86b0735 100644
--- a/klaptopdaemon/CMakeLists.txt
+++ b/klaptopdaemon/CMakeLists.txt
@@ -50,6 +50,7 @@ tde_add_library( kcmlaptop SHARED AUTOMOC
daemon_state.cpp wake_laptop.cpp
krichtextlabel.cpp
LINK kio-shared
+ VERSION 0.0.0
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kregexpeditor/CMakeLists.txt b/kregexpeditor/CMakeLists.txt
index da87046..ee0eca5 100644
--- a/kregexpeditor/CMakeLists.txt
+++ b/kregexpeditor/CMakeLists.txt
@@ -86,7 +86,7 @@ tde_add_library( kregexpeditorcommon SHARED AUTOMOC
##### kregexpeditorgui (kpart) ##################
-tde_add_kpart( kregexpeditorgui AUTOMOC
+tde_add_kpart( libkregexpeditorgui AUTOMOC
SOURCES kregexpeditorfactory.cpp
DESTINATION ${PLUGIN_INSTALL_DIR}
LINK kregexpeditorcommon-shared
diff --git a/kregexpeditor/KMultiFormListBox/CMakeLists.txt b/kregexpeditor/KMultiFormListBox/CMakeLists.txt
index 03ef2c9..31f4b3e 100644
--- a/kregexpeditor/KMultiFormListBox/CMakeLists.txt
+++ b/kregexpeditor/KMultiFormListBox/CMakeLists.txt
@@ -38,3 +38,13 @@ tde_add_library( kmultiformlistbox STATIC_PIC AUTOMOC
widgetwindow.cpp windowlistboxitem.cpp
)
+
+##### other data ################################
+
+install(
+ FILES
+ kmultiformlistbox.h
+ kmultiformlistboxentry.h
+ kmultiformlistboxfactory.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/kregexpeditor/KWidgetStreamer/CMakeLists.txt b/kregexpeditor/KWidgetStreamer/CMakeLists.txt
index 9f738b9..e5b27b7 100644
--- a/kregexpeditor/KWidgetStreamer/CMakeLists.txt
+++ b/kregexpeditor/KWidgetStreamer/CMakeLists.txt
@@ -33,3 +33,11 @@ tde_add_library( kwidgetstreamer STATIC_PIC AUTOMOC
SOURCES kwidgetstreamer.cpp
)
+
+##### other data ################################
+
+install(
+ FILES
+ kwidgetstreamer.h
+ DESTINATION ${INCLUDE_INSTALL_DIR}
+)
diff --git a/ksim/library/CMakeLists.txt b/ksim/library/CMakeLists.txt
index 44c152e..f66f1bd 100644
--- a/ksim/library/CMakeLists.txt
+++ b/ksim/library/CMakeLists.txt
@@ -31,7 +31,7 @@ tde_add_library( ksimcore SHARED AUTOMOC
label.cpp led.cpp progress.cpp
pluginglobal.cpp pluginloader.cpp
pluginmodule.cpp ksimconfig.cpp
- VERSION 1.0
+ VERSION 1.0.0
LINK tdeui-shared
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/kwallet/konfigurator/CMakeLists.txt b/kwallet/konfigurator/CMakeLists.txt
index a6b77e1..e6af5e7 100644
--- a/kwallet/konfigurator/CMakeLists.txt
+++ b/kwallet/konfigurator/CMakeLists.txt
@@ -37,3 +37,9 @@ install( FILES kwalletconfig.desktop
DESTINATION ${XDG_APPS_INSTALL_DIR}
)
+install(
+ FILES
+ kwallet_config.desktop
+ kwalletmanager_show.desktop
+ DESTINATION ${SERVICES_INSTALL_DIR}
+)