diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-11 20:19:59 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-11 20:19:59 +0000 |
| commit | cf46a70c5cc373e23ea2075c2a2fb0e41cfffe96 (patch) | |
| tree | 5d87d914c0e3dcbd002b484accb5305784af61eb /modules/KDE4Macros.cmake | |
| parent | 48ba4c4ffbcdfc8eb9c4ddcb96742163efc13802 (diff) | |
| download | extra-cmake-modules-cf46a70c5cc373e23ea2075c2a2fb0e41cfffe96.tar.gz extra-cmake-modules-cf46a70c5cc373e23ea2075c2a2fb0e41cfffe96.tar.bz2 | |
-changed kde4_create_libtool_file (target dir_relative_to_libdir)
to kde4_install_libtool_file(dir_relative_to_install_prefix target)
-added variable KDE4_PLUGIN_INSTALL_DIR, used usually for installing plugins
-changed am2cmake accordingly
-edited FindLibXml2.cmake and FindLibArt so that they work correctly with CMAKE_INSTALL_PATH
-changed generated_findpackage_file accordingly
-some minor formatting changes
Alex
CCMAIL: montel@kde.org
svn path=/trunk/KDE/kdelibs/; revision=508458
Diffstat (limited to 'modules/KDE4Macros.cmake')
| -rw-r--r-- | modules/KDE4Macros.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 64520a12..61c6dc97 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -6,7 +6,7 @@ # KDE4_ADD_UI_FILES # KDE4_ADD_KCFG_FILES # KDE4_AUTOMOC -# KDE4_CREATE_LIBTOOL_FILE +# KDE4_INSTALL_LIBTOOL_FILE # KDE4_PLACEHOLDER # KDE4_CREATE_FINAL_FILE # KDE4_ADD_KPART @@ -336,7 +336,7 @@ MACRO(KDE4_FOOTER) ENDMACRO(KDE4_FOOTER) -MACRO(KDE4_CREATE_LIBTOOL_FILE _target _subdir) +MACRO(KDE4_INSTALL_LIBTOOL_FILE _subdir _target) GET_TARGET_PROPERTY(_target_location ${_target} LOCATION) GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE) @@ -358,11 +358,11 @@ 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}/${_subdir}'\n") + FILE(APPEND ${_laname} "libdir='${CMAKE_INSTALL_PREFIX}/${_subdir}'\n") - INSTALL_FILES(${KDE4_LIB_INSTALL_DIR}/${_subdir} FILES ${_laname}) + INSTALL_FILES(${_subdir} FILES ${_laname}) MACRO_ADDITIONAL_CLEAN_FILES( ${_laname}) -ENDMACRO(KDE4_CREATE_LIBTOOL_FILE) +ENDMACRO(KDE4_INSTALL_LIBTOOL_FILE) MACRO(KDE4_CREATE_FINAL_FILES _filenameCPP _filenameC ) @@ -405,7 +405,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_INSTALL_LIBTOOL_FILE(${_target_NAME}) # ENDIF (UNIX) ENDMACRO(KDE4_ADD_PLUGIN _target_NAME _with_PREFIX) |