KDE/kdepimlibs

[Christophe Giboudeaux]

SVN commit 966746 by cgiboudeaux:

As mentioned by Alex when KDEPIMLIBS_INCLUDE_DIRS was created, installing the kdepimlibs CamelCase headers in
the same dir as the kdelibs ones is not a good idea. (different package -> different dir).

They will now be installed in include/KDEPIMLIBS.


CCMAIL: kde-pim at kde.org
CCMAIL: kde-buildsystem at kde.org



 M  +1 -1      KdepimLibsConfig.cmake.in  
 M  +1 -1      includes/CMakeLists.txt  


--- trunk/KDE/kdepimlibs/KdepimLibsConfig.cmake.in #966745:966746
@@ -15,7 +15,7 @@
 set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@")
 set(KDEPIMLIBS_DBUS_SERVICES_DIR   "@KDEPIMLIBS_DBUS_SERVICES_DIR@")
 set(KDEPIMLIBS_INCLUDE_DIR         "@KDEPIMLIBS_INCLUDE_DIR@")
-set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE")
+set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDEPIMLIBS")
 set(KDEPIMLIBS_LIB_DIR             "@KDEPIMLIBS_LIB_DIR@")
 set(KDEPIMLIBS_BIN_DIR             "@KDEPIMLIBS_BIN_DIR@") 
 set(KDEPIMLIBS_LIBEXEC_DIR         "@KDEPIMLIBS_LIBEXEC_DIR@")
--- trunk/KDE/kdepimlibs/includes/CMakeLists.txt #966745:966746
@@ -4,7 +4,7 @@
 
 macro(install_headers _dir)
   file(GLOB _includes "${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/[A-Za-z]*")
-  install(FILES ${_includes} DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/${_dir} COMPONENT Devel)
+  install(FILES ${_includes} DESTINATION ${INCLUDE_INSTALL_DIR}/KDEPIMLIBS/${_dir} COMPONENT Devel)
 endmacro(install_headers)
 
 if(Akonadi_FOUND)