summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-03-21 20:40:48 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-10-18 18:56:20 +0200
commita34b0b48eb856f8128251684059ffc41e06479c0 (patch)
tree604d54076e80e6bbdad7492ca93a89cf3fb8c8f7
parent50f01165ea4f2b48c4fe0e9a35d2c4cdb70cd1cc (diff)
downloadtdepim-a34b0b48eb856f8128251684059ffc41e06479c0.tar.gz
tdepim-a34b0b48eb856f8128251684059ffc41e06479c0.zip
Change ${INCLUDE_INSTALL_DIR}/tde -> ${INCLUDE_INSTALL_DIR}.
Installing header files to ${INCLUDE_INSTALL_DIR}/tde added another subdirectory layer that caused build failures in certain apps such as kipi-plugins. This partially resolves bug report 600. (cherry picked from commit b99d4323ddffa1b9edcb8bab724a73729b79d883)
-rw-r--r--akregator/src/CMakeLists.txt2
-rw-r--r--certmanager/lib/kleo/CMakeLists.txt2
-rw-r--r--indexlib/CMakeLists.txt2
-rw-r--r--kaddressbook/interfaces/CMakeLists.txt2
-rw-r--r--kgantt/kgantt/CMakeLists.txt2
-rw-r--r--kmail/CMakeLists.txt2
-rw-r--r--kmail/interfaces/CMakeLists.txt2
-rw-r--r--knotes/CMakeLists.txt2
-rw-r--r--kontact/interfaces/CMakeLists.txt2
-rw-r--r--korganizer/interfaces/calendar/CMakeLists.txt2
-rw-r--r--korganizer/interfaces/korganizer/CMakeLists.txt2
-rw-r--r--kresources/egroupware/CMakeLists.txt2
-rw-r--r--ktnef/ktnef/CMakeLists.txt2
-rw-r--r--libemailfunctions/CMakeLists.txt2
-rw-r--r--libkcal/CMakeLists.txt2
-rw-r--r--libkdenetwork/gpgmepp/CMakeLists.txt2
-rw-r--r--libkdenetwork/qgpgme/CMakeLists.txt2
-rw-r--r--libkdepim/CMakeLists.txt2
-rw-r--r--libkpimexchange/core/CMakeLists.txt2
-rw-r--r--libksieve/ksieve/CMakeLists.txt2
-rw-r--r--mimelib/mimelib/CMakeLists.txt2
21 files changed, 21 insertions, 21 deletions
diff --git a/akregator/src/CMakeLists.txt b/akregator/src/CMakeLists.txt
index 4ade48f7..f039f376 100644
--- a/akregator/src/CMakeLists.txt
+++ b/akregator/src/CMakeLists.txt
@@ -39,7 +39,7 @@ link_directories(
install( FILES
plugin.h articleinterceptor.h akregator_export.h storage.h
feedstorage.h storagefactory.h storagefactoryregistry.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/akregator )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/akregator )
##### other data ################################
diff --git a/certmanager/lib/kleo/CMakeLists.txt b/certmanager/lib/kleo/CMakeLists.txt
index b75c0028..e94b8449 100644
--- a/certmanager/lib/kleo/CMakeLists.txt
+++ b/certmanager/lib/kleo/CMakeLists.txt
@@ -34,7 +34,7 @@ install( FILES
verifyopaquejob.h decryptverifyjob.h signencryptjob.h
refreshkeysjob.h multideletejob.h hierarchicalkeylistjob.h
keyfilter.h keyfiltermanager.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kleo )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kleo )
##### kleopatra_core (static) ###################
diff --git a/indexlib/CMakeLists.txt b/indexlib/CMakeLists.txt
index 93e215e4..f89e4f1a 100644
--- a/indexlib/CMakeLists.txt
+++ b/indexlib/CMakeLists.txt
@@ -26,7 +26,7 @@ include_directories(
install( FILES
create.h index.h lockfile.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/index )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/index )
##### other data ################################
diff --git a/kaddressbook/interfaces/CMakeLists.txt b/kaddressbook/interfaces/CMakeLists.txt
index 7def4460..e8260b7b 100644
--- a/kaddressbook/interfaces/CMakeLists.txt
+++ b/kaddressbook/interfaces/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
install( FILES
configurewidget.h contacteditorwidget.h core.h
extensionwidget.h xxport.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kaddressbook )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kaddressbook )
##### other data ################################
diff --git a/kgantt/kgantt/CMakeLists.txt b/kgantt/kgantt/CMakeLists.txt
index 48e1a36b..371a9fe0 100644
--- a/kgantt/kgantt/CMakeLists.txt
+++ b/kgantt/kgantt/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
install( FILES
KGantt.h KGanttItem.h KGanttRelation.h xQGanttBarView.h xQGanttBarViewPort.h
xQGanttListView.h xQGanttListViewPort.h KGanttBarConfig.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kgantt )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kgantt )
##### kgantt (shared) ###########################
diff --git a/kmail/CMakeLists.txt b/kmail/CMakeLists.txt
index c2edd238..69da3e34 100644
--- a/kmail/CMakeLists.txt
+++ b/kmail/CMakeLists.txt
@@ -65,7 +65,7 @@ link_directories(
install( FILES
kmailIface.h kmailpartIface.h kmailicalIface.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
+ DESTINATION ${INCLUDE_INSTALL_DIR} )
##### other data ################################
diff --git a/kmail/interfaces/CMakeLists.txt b/kmail/interfaces/CMakeLists.txt
index df743700..1dd411df 100644
--- a/kmail/interfaces/CMakeLists.txt
+++ b/kmail/interfaces/CMakeLists.txt
@@ -12,4 +12,4 @@
install( FILES
observer.h observable.h htmlwriter.h bodypart.h
bodypartformatter.h bodyparturlhandler.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kmail/interfaces )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kmail/interfaces )
diff --git a/knotes/CMakeLists.txt b/knotes/CMakeLists.txt
index 0fc95815..a83e8cf9 100644
--- a/knotes/CMakeLists.txt
+++ b/knotes/CMakeLists.txt
@@ -34,7 +34,7 @@ link_directories(
##### headers ###################################
-install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
+install( FILES KNotesIface.h KNotesAppIface.h DESTINATION ${INCLUDE_INSTALL_DIR} )
##### other data ################################
diff --git a/kontact/interfaces/CMakeLists.txt b/kontact/interfaces/CMakeLists.txt
index 68a7a46f..997fbc30 100644
--- a/kontact/interfaces/CMakeLists.txt
+++ b/kontact/interfaces/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
install( FILES
core.h plugin.h summary.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kontact )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kontact )
##### other data ################################
diff --git a/korganizer/interfaces/calendar/CMakeLists.txt b/korganizer/interfaces/calendar/CMakeLists.txt
index 572ca92b..fe5296fe 100644
--- a/korganizer/interfaces/calendar/CMakeLists.txt
+++ b/korganizer/interfaces/calendar/CMakeLists.txt
@@ -11,7 +11,7 @@
install( FILES
plugin.h calendardecoration.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/calendar )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/calendar )
install( FILES
calendarplugin.desktop calendardecoration.desktop
diff --git a/korganizer/interfaces/korganizer/CMakeLists.txt b/korganizer/interfaces/korganizer/CMakeLists.txt
index 1db81d87..6b5a45f2 100644
--- a/korganizer/interfaces/korganizer/CMakeLists.txt
+++ b/korganizer/interfaces/korganizer/CMakeLists.txt
@@ -11,7 +11,7 @@
install( FILES
part.h baseview.h calendarviewbase.h mainwindow.h corehelper.h printplugin.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/korganizer )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/korganizer )
install( FILES
korganizerpart.desktop korgprintplugin.desktop
diff --git a/kresources/egroupware/CMakeLists.txt b/kresources/egroupware/CMakeLists.txt
index aa61c9b9..4843d151 100644
--- a/kresources/egroupware/CMakeLists.txt
+++ b/kresources/egroupware/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
install( FILES
kabc_resourcexmlrpc.h kcal_resourcexmlrpc.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kabc )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
##### other data ################################
diff --git a/ktnef/ktnef/CMakeLists.txt b/ktnef/ktnef/CMakeLists.txt
index 0dadf1d8..1bd4912c 100644
--- a/ktnef/ktnef/CMakeLists.txt
+++ b/ktnef/ktnef/CMakeLists.txt
@@ -13,4 +13,4 @@ install( FILES
ktnefparser.h ktnefattach.h ktnefproperty.h
ktnefpropertyset.h ktnefmessage.h ktnefwriter.h
ktnefdefs.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/ktnef )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/ktnef )
diff --git a/libemailfunctions/CMakeLists.txt b/libemailfunctions/CMakeLists.txt
index cbdd3510..13004d64 100644
--- a/libemailfunctions/CMakeLists.txt
+++ b/libemailfunctions/CMakeLists.txt
@@ -25,7 +25,7 @@ link_directories(
##### header files ################################
if( BUILD_LIBKDEPIM )
- install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libemailfunctions )
+ install( FILES idmapper.h DESTINATION ${INCLUDE_INSTALL_DIR}/libemailfunctions )
endif()
diff --git a/libkcal/CMakeLists.txt b/libkcal/CMakeLists.txt
index 51d42f59..0a5a3fe1 100644
--- a/libkcal/CMakeLists.txt
+++ b/libkcal/CMakeLists.txt
@@ -49,7 +49,7 @@ install( FILES
resourcelocaldirconfig.h resourcelocaldir.h resourcelocal.h
scheduler.h libkcal_export.h todo.h vcaldrag.h vcalformat.h
attachmenthandler.h ${CMAKE_CURRENT_BINARY_DIR}/htmlexportsettings.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/libkcal )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/libkcal )
##### other data ################################
diff --git a/libkdenetwork/gpgmepp/CMakeLists.txt b/libkdenetwork/gpgmepp/CMakeLists.txt
index 32ee0ca8..3e683e67 100644
--- a/libkdenetwork/gpgmepp/CMakeLists.txt
+++ b/libkdenetwork/gpgmepp/CMakeLists.txt
@@ -35,7 +35,7 @@ install( FILES
keygenerationresult.h importresult.h decryptionresult.h
verificationresult.h signingresult.h encryptionresult.h
engineinfo.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/gpgme++ )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/gpgme++ )
##### gpgme++ (shared) ##########################
diff --git a/libkdenetwork/qgpgme/CMakeLists.txt b/libkdenetwork/qgpgme/CMakeLists.txt
index bde8cd82..064c0fe4 100644
--- a/libkdenetwork/qgpgme/CMakeLists.txt
+++ b/libkdenetwork/qgpgme/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
install( FILES
eventloopinteractor.h dataprovider.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/qgpgme )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/qgpgme )
##### qgpgme (shared) ###########################
diff --git a/libkdepim/CMakeLists.txt b/libkdepim/CMakeLists.txt
index b27f6a19..6896d97e 100644
--- a/libkdepim/CMakeLists.txt
+++ b/libkdepim/CMakeLists.txt
@@ -40,7 +40,7 @@ link_directories(
install( FILES
kdepimmacros.h kpimprefs.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
+ DESTINATION ${INCLUDE_INSTALL_DIR} )
##### other data ################################
diff --git a/libkpimexchange/core/CMakeLists.txt b/libkpimexchange/core/CMakeLists.txt
index e1d246ca..8faa3f26 100644
--- a/libkpimexchange/core/CMakeLists.txt
+++ b/libkpimexchange/core/CMakeLists.txt
@@ -30,7 +30,7 @@ link_directories(
install( FILES
exchangeclient.h exchangeaccount.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/kdepim )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/kdepim )
##### kpimexchange (shared) #####################
diff --git a/libksieve/ksieve/CMakeLists.txt b/libksieve/ksieve/CMakeLists.txt
index e474a68e..9765ddfa 100644
--- a/libksieve/ksieve/CMakeLists.txt
+++ b/libksieve/ksieve/CMakeLists.txt
@@ -11,4 +11,4 @@
install( FILES
error.h lexer.h parser.h scriptbuilder.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/ksieve )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/ksieve )
diff --git a/mimelib/mimelib/CMakeLists.txt b/mimelib/mimelib/CMakeLists.txt
index 44488453..0f2c6141 100644
--- a/mimelib/mimelib/CMakeLists.txt
+++ b/mimelib/mimelib/CMakeLists.txt
@@ -16,4 +16,4 @@ install( FILES
mboxlist.h mechansm.h mediatyp.h message.h mimepp.h
msgcmp.h msgid.h nntp.h param.h pop.h protocol.h
string.h text.h token.h utility.h uuencode.h binhex.h
- DESTINATION ${INCLUDE_INSTALL_DIR}/kde/mimelib )
+ DESTINATION ${INCLUDE_INSTALL_DIR}/mimelib )