diff options
| author | Laurent Montel <montel@kde.org> | 2006-02-02 07:52:42 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2006-02-02 07:52:42 +0000 |
| commit | 60f38460a32b31f43b121a36b16d351cb67525f7 (patch) | |
| tree | e97b234b4d3c4391d20bdd45312648fea8c5b5db | |
| parent | a75fa4e60bad0a7d0a9fa3a728d62c09de5d7fa4 (diff) | |
| download | extra-cmake-modules-60f38460a32b31f43b121a36b16d351cb67525f7.tar.gz extra-cmake-modules-60f38460a32b31f43b121a36b16d351cb67525f7.tar.bz2 | |
Add "KDE4_LIB_INSTALL_DIR" as discussed with alexander to
fix install lib on x86_64
svn path=/trunk/KDE/kdelibs/; revision=504772
| -rwxr-xr-x | am2cmake | 6 | ||||
| -rw-r--r-- | modules/FindKDE4.cmake | 1 |
2 files changed, 4 insertions, 3 deletions
@@ -842,7 +842,7 @@ class CMakeFile file.printf(" )\n\n") file.printf("set_target_properties(%s PROPERTIES VERSION %d.%d.%d SOVERSION %d )\n", buildTarget.name, buildTarget.versionNumberMajor, buildTarget.versionNumberMinor, buildTarget.versionNumberPatch, buildTarget.versionNumberMajor) - file.printf("install_targets(/lib %s )\n\n", buildTarget.name) + file.printf("install_targets(${KDE4_LIB_INSTALL_DIR} %s )\n\n", buildTarget.name) elsif buildTarget.type==StaticLib file.printf("kde4_add_library(%s STATIC ${%s})\n\n", buildTarget.name, srcsName) @@ -857,7 +857,7 @@ class CMakeFile buildTarget.libs.each { |currentLib| file.printf(" %s", currentLib) } file.printf(" )\n\n") - file.printf("install_targets(/lib/kde4 %s )\n\n", buildTarget.name) + file.printf("install_targets(${KDE4_LIB_INSTALL_DIR}/kde4 %s )\n\n", buildTarget.name) elsif buildTarget.type==KDEInit file.printf("kde4_add_klm( %s ${%s})\n\n", buildTarget.name, srcsName) @@ -865,7 +865,7 @@ class CMakeFile buildTarget.libs.each { |currentLib| file.printf(" %s", currentLib) } file.printf(" )\n\n") - file.printf("install_targets(/lib kdeinit_%s )\n\n", buildTarget.name) + file.printf("install_targets(${KDE4_LIB_INSTALL_DIR} kdeinit_%s )\n\n", buildTarget.name) file.printf("target_link_libraries( %s kdeinit_%s )\n", buildTarget.name, buildTarget.name) diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 3a68ed4f..611ba064 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -42,6 +42,7 @@ SET(KDE4_DIR ${CMAKE_INSTALL_PREFIX}) #SET(KDE4_SYSCONF_INSTALL_DIR "/etc" CACHE STRING "The kde sysconfig install dir (default /etc)") SET(KDE4_MAN_INSTALL_DIR "/man" CACHE STRING "The kde man install dir (default prefix/man/)") SET(KDE4_INFO_INSTALL_DIR "/info" CACHE STRING "The kde info install dir (default prefix/info)") +SET(KDE4_LIB_INSTALL_DIR "/lib" CACHE STRING "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)") SET(KDE4_APPS_DIR /share/applnk) SET(KDE4_CONFIG_DIR /share/config) SET(KDE4_DATA_DIR /share/apps) |