diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-07-04 11:25:27 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-07-04 11:25:27 +0000 |
| commit | fa96ac38472cfb854e361d761c6edb941fae2fde (patch) | |
| tree | a258387e6dc9dd3206689a98312d18f597ae3548 | |
| parent | 9656eb9a98a56452478d9a1c73866691f66261b4 (diff) | |
| download | extra-cmake-modules-fa96ac38472cfb854e361d761c6edb941fae2fde.tar.gz extra-cmake-modules-fa96ac38472cfb854e361d761c6edb941fae2fde.tar.bz2 | |
-adjust the LD_LIBRARY_PATH for the new contents of LIB_INSTALL_DIR (now the complete absolute path)
Alex
svn path=/trunk/KDE/kdelibs/; revision=557909
| -rw-r--r-- | modules/KDE4Macros.cmake | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index a85a39ab..6b53e505 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -303,7 +303,7 @@ macro (KDE4_HANDLE_RPATH _target_NAME _type) set(_library_path_variable "LD_LIBRARY_PATH") endif (APPLE) - set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${CMAKE_INSTALL_PREFIX}${LIB_INSTALL_DIR}:${KDE4_LIB_DIR}:${QT_LIBRARY_DIR}") + set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/:${LIB_INSTALL_DIR}:${KDE4_LIB_DIR}:${QT_LIBRARY_DIR}") get_target_property(_executable ${_target_NAME} LOCATION ) # use add_custom_target() to have the sh-wrapper generated during build time instead of cmake time @@ -325,6 +325,19 @@ macro (KDE4_HANDLE_RPATH _target_NAME _type) # maybe later this will change to a generated batch file (for setting the PATH so that the Qt libs are found) get_target_property(_executable ${_target_NAME} LOCATION ) set_target_properties(${_target_NAME} PROPERTIES WRAPPER_SCRIPT ${_executable}) + + set(_ld_library_path "${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/;${LIB_INSTALL_DIR};${KDE4_LIB_DIR};${QT_LIBRARY_DIR}") + get_target_property(_executable ${_target_NAME} LOCATION ) + + # use add_custom_target() to have the batch-file-wrapper generated during build time instead of cmake time + add_custom_command(TARGET ${_target_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} + -D_filename=${_executable}.bat + -D_ld_library_path="${_ld_library_path}" -D_executable=${_executable} + -P ${KDE4_MODULE_DIR}/kde4_exec_via_sh.cmake + ) + + endif (UNIX) endmacro (KDE4_HANDLE_RPATH) |