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 b99d4323dd)
13 years ago · a34b0b48eb
parent 50f01165ea
commit a34b0b48eb
21 changed files with 21 additions and 21 deletions
--- 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 ################################
--- 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) ###################
--- 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 ################################
--- 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 ################################
--- 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) ###########################
--- 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 ################################
--- 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 )
--- 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 ################################
--- 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 ################################
--- 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
--- 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
--- 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 ################################
--- 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 )
--- 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()


--- 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 ################################
--- 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) ##########################
--- 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) ###########################
--- 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 ################################
--- 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) #####################
--- 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 )
--- 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 )