diff options
| author | Laurent Montel <montel@kde.org> | 2006-02-07 11:57:14 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2006-02-07 11:57:14 +0000 |
| commit | 5fc4f5fe3e9731dc869df15080b2b3b532c99d66 (patch) | |
| tree | 4b061c8dc4aee9ae0cf035ee5d4be9fca48423fa | |
| parent | d472dffcbd1d4629394dea7517d409163011252e (diff) | |
| download | extra-cmake-modules-5fc4f5fe3e9731dc869df15080b2b3b532c99d66.tar.gz extra-cmake-modules-5fc4f5fe3e9731dc869df15080b2b3b532c99d66.tar.bz2 | |
Now we specify lib dir
now we can specify /usr/lib directory and not jsut usr/lib/kde4 for la lib
(necessary for .la installed into /usr/lib)
svn path=/trunk/KDE/kdelibs/; revision=506650
| -rwxr-xr-x | am2cmake | 4 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -850,10 +850,10 @@ class CMakeFile elsif buildTarget.type==Part if buildTarget.stdPrefix file.printf("kde4_add_plugin(%s WITH_PREFIX ${%s})\n\n", buildTarget.name, srcsName) - file.printf("kde4_create_libtool_file( %s / )\n\n", buildTarget.name) + file.printf("kde4_create_libtool_file( %s /kde4/ )\n\n", buildTarget.name) else file.printf("kde4_add_plugin(%s ${%s})\n\n", buildTarget.name, srcsName) - file.printf("kde4_create_libtool_file( %s / )\n\n", buildTarget.name) + file.printf("kde4_create_libtool_file( %s /kde4/ )\n\n", buildTarget.name) end file.printf("target_link_libraries(%s ", buildTarget.name) buildTarget.libs.each { |currentLib| file.printf(" %s", currentLib) } diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 43d6eba9..d8566dab 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -393,9 +393,9 @@ MACRO(KDE4_CREATE_LIBTOOL_FILE _target _subdir) FILE(APPEND ${_laname} "# Should we warn about portability when linking against -modules?\nshouldnotlink=yes\n") FILE(APPEND ${_laname} "# Files to dlopen/dlpreopen\ndlopen=''\ndlpreopen=''\n") FILE(APPEND ${_laname} "# Directory that this library needs to be installed in:\n") - FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${KDE4_LIB_INSTALL_DIR}/kde4/${_subdir}'\n") + FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${KDE4_LIB_INSTALL_DIR}/${_subdir}'\n") - INSTALL_FILES(${KDE4_LIB_INSTALL_DIR}/kde4/${_subdir} FILES ${_laname}) + INSTALL_FILES(${KDE4_LIB_INSTALL_DIR}/${_subdir} FILES ${_laname}) ENDMACRO(KDE4_CREATE_LIBTOOL_FILE) |