diff options
| author | Laurent Montel <montel@kde.org> | 2006-02-07 11:16:32 +0000 |
|---|---|---|
| committer | Laurent Montel <montel@kde.org> | 2006-02-07 11:16:32 +0000 |
| commit | 455902e5dc8299b22fa6087f8fc2d756146f8515 (patch) | |
| tree | 6fcedf604bd01aa1b8233c9cb4afd1810b27b3bb | |
| parent | 59b48b4798e6a65b4dfd3d2f54a7fa9d812d641a (diff) | |
| download | extra-cmake-modules-455902e5dc8299b22fa6087f8fc2d756146f8515.tar.gz extra-cmake-modules-455902e5dc8299b22fa6087f8fc2d756146f8515.tar.bz2 | |
Now we can install .la lib into good directory
before it installed la lib just in /usr/lib/kde4
svn path=/trunk/KDE/kdelibs/; revision=506638
| -rwxr-xr-x | am2cmake | 4 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 8 |
2 files changed, 8 insertions, 4 deletions
@@ -850,8 +850,12 @@ class CMakeFile elsif buildTarget.type==Part if buildTarget.stdPrefix file.printf("kde4_add_plugin(%s WITH_PREFIX ${%s})\n\n", buildTarget.name, srcsName) + +kde4_create_libtool_file( / ) else file.printf("kde4_add_plugin(%s ${%s})\n\n", buildTarget.name, srcsName) + +kde4_create_libtool_file( / ) 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 322fec7e..43d6eba9 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -371,7 +371,7 @@ MACRO(KDE4_FOOTER) ENDMACRO(KDE4_FOOTER) -MACRO(KDE4_CREATE_LIBTOOL_FILE _target) +MACRO(KDE4_CREATE_LIBTOOL_FILE _target _subdir) GET_TARGET_PROPERTY(_target_location ${_target} LOCATION) GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE) @@ -393,9 +393,9 @@ MACRO(KDE4_CREATE_LIBTOOL_FILE _target) 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'\n") + FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${KDE4_LIB_INSTALL_DIR}/kde4/${_subdir}'\n") - INSTALL_FILES(${KDE4_LIB_INSTALL_DIR}/kde4 FILES ${_laname}) + INSTALL_FILES(${KDE4_LIB_INSTALL_DIR}/kde4/${_subdir} FILES ${_laname}) ENDMACRO(KDE4_CREATE_LIBTOOL_FILE) @@ -439,7 +439,7 @@ MACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) # IF (UNIX) # I guess under windows the libtool file are not required - KDE4_CREATE_LIBTOOL_FILE(${_target_NAME}) + #KDE4_CREATE_LIBTOOL_FILE(${_target_NAME}) # ENDIF (UNIX) ENDMACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) |