diff options
author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-10-24 21:53:26 +0000 |
---|---|---|
committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-10-24 21:53:26 +0000 |
commit | 40fe6a00b6dde631a68e40731fabb71680a5454c (patch) | |
tree | 8e06828694f6a83f427c022e6b44e911eb7e9ed9 /kdecore/CMakeLists.txt | |
parent | 6e5ec36b7925e29501aaf12fe5ae5e58d590f63f (diff) | |
download | tdelibs-40fe6a00b6dde631a68e40731fabb71680a5454c.tar.gz tdelibs-40fe6a00b6dde631a68e40731fabb71680a5454c.zip |
[kdelibs] follow KDE4 rules for install path names and some other small changes
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1189382 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/CMakeLists.txt')
-rw-r--r-- | kdecore/CMakeLists.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index 56243a9a3..c475c89c3 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -77,7 +77,7 @@ install( FILES ##### other data ################################ -tde_install_empty_directory( ${SHARE_INSTALL_DIR}/locale/all_languages ) +tde_install_empty_directory( ${LOCALE_INSTALL_DIR}/all_languages ) install( FILES 40.colors Web.colors Royal.colors Rainbow.colors DESTINATION ${CONFIG_INSTALL_DIR}/colors ) @@ -183,18 +183,8 @@ tde_add_library( ${target} SHARED ##### kde-config ################################ -# FIXME need a little research about these parameters -set( prefix ${CMAKE_INSTALL_PREFIX} ) -set( exec_prefix "\${prefix}" ) -set( libdir ${LIB_INSTALL_DIR} ) -set( incdir ${INCLUDE_INSTALL_DIR} ) -set( datadir ${SHARE_INSTALL_DIR} ) -set( sysconfdir ${SYSCONFDIR} ) - -string( REGEX REPLACE "^${SHARE_INSTALL_DIR}" "\${datadir}" kde_datadir ${DATA_INSTALL_DIR} ) -string( REGEX REPLACE "^${prefix}" "\${prefix}" includedir ${INCLUDE_INSTALL_DIR} ) - -configure_file( kde-config.cpp.in kde-config.cpp @ONLY ) +# FIXME still need some research and improvements +configure_file( kde-config.cpp.cmake kde-config.cpp @ONLY ) tde_add_executable( kde-config |