[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepimlibs
From:       Christophe Giboudeaux <cgiboudeaux () gmail ! com>
Date:       2009-05-13 10:08:35
Message-ID: 1242209315.853540.9595.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 967363 by cgiboudeaux:

OK, I give up.

Despite what could be read recently on the buildsystem ML, KdepimLibs is not \
'special'. For the sake of the 'Coherency with other modules' we will happily be \
pouring the kdepimlibs CamelCase headers in the KDE/ blob until KDE5.

The initial idea was to avoid contributing to the general mess in this directory and \
making identification much easier ('what does the header X belong to?' -> 'module \
Y'). Sadly, that won't happen.




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


--- trunk/KDE/kdepimlibs/KdepimLibsConfig.cmake.in #967362:967363
@@ -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@/KDEPIMLibs") +set(KDEPIMLIBS_INCLUDE_DIRS        \
"@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE")  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 #967362:967363
@@ -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}/KDEPIMLibs/${_dir} \
COMPONENT Devel) +  install(FILES ${_includes} DESTINATION \
${INCLUDE_INSTALL_DIR}/KDE/${_dir} COMPONENT Devel)  endmacro(install_headers)
 
 if(Akonadi_FOUND)


[prev in list] [next in list] [prev in thread] [next in thread]