diff options
| author | Laurent Montel <montel@kde.org> | 2006-07-04 11:16:03 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2006-07-04 11:16:03 +0000 |
| commit | 9656eb9a98a56452478d9a1c73866691f66261b4 (patch) | |
| tree | 4d17555b781227c53b92c9490e3742f76696a29a /modules/KDE4Macros.cmake | |
| parent | e5b714dceb2e5d405ef98a1375eed42234f13d52 (diff) | |
| download | extra-cmake-modules-9656eb9a98a56452478d9a1c73866691f66261b4.tar.gz extra-cmake-modules-9656eb9a98a56452478d9a1c73866691f66261b4.tar.bz2 | |
Commit big work on build system with Alex:
install_* -> install
Summary: we can install everything everywhere.
svn path=/trunk/KDE/kdelibs/; revision=557905
The following changes were in SVN, but were removed from git:
M pics/crystalsvg/CMakeLists.txt
M pics/hicolor/CMakeLists.txt
Diffstat (limited to 'modules/KDE4Macros.cmake')
| -rw-r--r-- | modules/KDE4Macros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 952f59b0..a85a39ab 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -217,7 +217,7 @@ MACRO (KDE4_INSTALL_ICONS _defaultpath _theme ) STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\2" _group "${_current_ICON}") STRING(REGEX REPLACE "^.*/[a-zA-Z]+([0-9]+)\\-([a-z]+)\\-(.+\\.png)$" "\\3" _name "${_current_ICON}") _KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake - ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/${_theme}/${_size}x${_size} + ${_defaultpath}/${_theme}/${_size}x${_size} ${_group} ${_current_ICON} ${_name}) ENDforeach (_current_ICON) @@ -227,7 +227,7 @@ MACRO (KDE4_INSTALL_ICONS _defaultpath _theme ) STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\1" _group "${_current_ICON}") STRING(REGEX REPLACE "^.*/crsc\\-([a-z]+)\\-(.+\\.svgz)$" "\\2" _name "${_current_ICON}") _KDE4_ADD_ICON_INSTALL_RULE(${CMAKE_CURRENT_BINARY_DIR}/install_icons.cmake - ${CMAKE_INSTALL_PREFIX}/${_defaultpath}/${_theme}/scalable + ${_defaultpath}/${_theme}/scalable ${_group} ${_current_ICON} ${_name}) ENDforeach (_current_ICON) @@ -258,7 +258,7 @@ MACRO (KDE4_INSTALL_LIBTOOL_FILE _subdir _target) FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n") FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${_subdir}'\n") - INSTALL_FILES(${_subdir} FILES ${_laname}) + INSTALL(FILES ${_laname} DESTINATION ${_subdir}) MACRO_ADDITIONAL_CLEAN_FILES(${_laname}) ENDMACRO (KDE4_INSTALL_LIBTOOL_FILE) |