Attachment 970 Details for Bug 1310 – Fix various cmake issues

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.

[patch] Fix various cmake issues

bp901.diff (text/plain), 5.60 KB, created by Slávek Banko on 2012-11-11 12:51:04 CST

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2012-11-11 12:51:04 CST

Size: 5.60 KB

patch

obsolete

>Index: b/ark/CMakeLists.txt
>===================================================================
>--- a/ark/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/ark/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -45,7 +45,7 @@
> 
> ##### 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
>Index: b/CMakeLists.txt
>===================================================================
>--- a/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -127,6 +127,16 @@
> 
> 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 )
>Index: b/khexedit/lib/CMakeLists.txt
>===================================================================
>--- a/khexedit/lib/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/khexedit/lib/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -47,6 +47,7 @@
>     kcharcoltextexport.cpp
>   LINK tdecore-shared kcontroller-static
>     khecodecs-static
>+  VERSION 0.0.0
>   DESTINATION ${LIB_INSTALL_DIR}
> )
> 
>Index: b/khexedit/parts/kbytesedit/CMakeLists.txt
>===================================================================
>--- a/khexedit/parts/kbytesedit/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/khexedit/parts/kbytesedit/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -26,7 +26,7 @@
> 
> ##### kbyteseditwidget (kpart) ##################
> 
>-tde_add_kpart( kbyteseditwidget AUTOMOC
>+tde_add_kpart( libkbyteseditwidget AUTOMOC
>   SOURCES kbyteseditwidget.cpp
>   DESTINATION ${PLUGIN_INSTALL_DIR}
>   LINK khexeditcommon-shared kparts-shared
>Index: b/khexedit/parts/kpart/CMakeLists.txt
>===================================================================
>--- a/khexedit/parts/kpart/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/khexedit/parts/kpart/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -26,7 +26,7 @@
> 
> ##### khexedit2part (kpart) #####################
> 
>-tde_add_kpart( khexedit2part AUTOMOC
>+tde_add_kpart( libkhexedit2part AUTOMOC
>   SOURCES khepart.cpp khebrowserextension.cpp
>     khepartfactory.cpp
>   LINK khexeditcommon-shared kparts-shared
>Index: b/klaptopdaemon/CMakeLists.txt
>===================================================================
>--- a/klaptopdaemon/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/klaptopdaemon/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -50,6 +50,7 @@
>     daemon_state.cpp wake_laptop.cpp
>     krichtextlabel.cpp
>   LINK kio-shared
>+  VERSION 0.0.0
>   DESTINATION ${LIB_INSTALL_DIR}
> )
> 
>Index: b/kregexpeditor/CMakeLists.txt
>===================================================================
>--- a/kregexpeditor/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/kregexpeditor/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -86,7 +86,7 @@
> 
> ##### kregexpeditorgui (kpart) ##################
> 
>-tde_add_kpart( kregexpeditorgui AUTOMOC
>+tde_add_kpart( libkregexpeditorgui AUTOMOC
>   SOURCES kregexpeditorfactory.cpp
>   DESTINATION ${PLUGIN_INSTALL_DIR}
>   LINK kregexpeditorcommon-shared
>Index: b/kregexpeditor/KMultiFormListBox/CMakeLists.txt
>===================================================================
>--- a/kregexpeditor/KMultiFormListBox/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/kregexpeditor/KMultiFormListBox/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -38,3 +38,13 @@
>     widgetwindow.cpp windowlistboxitem.cpp
> )
> 
>+
>+##### other data ################################
>+
>+install(
>+  FILES
>+    kmultiformlistbox.h
>+    kmultiformlistboxentry.h
>+    kmultiformlistboxfactory.h
>+  DESTINATION ${INCLUDE_INSTALL_DIR}
>+)
>Index: b/kregexpeditor/KWidgetStreamer/CMakeLists.txt
>===================================================================
>--- a/kregexpeditor/KWidgetStreamer/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/kregexpeditor/KWidgetStreamer/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -33,3 +33,11 @@
>   SOURCES kwidgetstreamer.cpp
> )
> 
>+
>+##### other data ################################
>+
>+install(
>+  FILES
>+    kwidgetstreamer.h
>+  DESTINATION ${INCLUDE_INSTALL_DIR}
>+)
>Index: b/ksim/library/CMakeLists.txt
>===================================================================
>--- a/ksim/library/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/ksim/library/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -31,7 +31,7 @@
>     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}
> )
>Index: b/kwallet/konfigurator/CMakeLists.txt
>===================================================================
>--- a/kwallet/konfigurator/CMakeLists.txt	2012-11-11 19:33:29.000000000 +0100
>+++ b/kwallet/konfigurator/CMakeLists.txt	2012-11-11 19:33:31.000000000 +0100
>@@ -37,3 +37,9 @@
>   DESTINATION ${XDG_APPS_INSTALL_DIR}
> )
> 
>+install(
>+  FILES
>+    kwallet_config.desktop
>+    kwalletmanager_show.desktop
>+  DESTINATION ${SERVICES_INSTALL_DIR}
>+)

Actions: View | Diff

Attachments on bug 1310: 962 | 970 | 972 | 1035