diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2007-01-21 11:48:42 +0000 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2007-01-21 11:48:42 +0000 |
| commit | 3111129ea0af631eb7f305970d1d205341f356fa (patch) | |
| tree | cb5e1d444ec6888faa222d818de8e556c56abcbc | |
| parent | 334e5ff5439d76c03d57b57518ebd596067fb837 (diff) | |
| download | extra-cmake-modules-3111129ea0af631eb7f305970d1d205341f356fa.tar.gz extra-cmake-modules-3111129ea0af631eb7f305970d1d205341f356fa.tar.bz2 | |
win32-only fixes:
- cmake's add_custom_target somehow steals our ';' - quote it with '\'
- fix reading $Path from environment
svn path=/trunk/KDE/kdelibs/; revision=625842
| -rw-r--r-- | modules/KDE4Macros.cmake | 6 | ||||
| -rwxr-xr-x | modules/kde4_exec_via_sh.cmake | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index f76fa253..404b5c11 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -527,10 +527,10 @@ macro (KDE4_HANDLE_RPATH_FOR_EXECUTABLE _target_NAME _type) 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}") + 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 + + # 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" diff --git a/modules/kde4_exec_via_sh.cmake b/modules/kde4_exec_via_sh.cmake index a42817a9..30a837af 100755 --- a/modules/kde4_exec_via_sh.cmake +++ b/modules/kde4_exec_via_sh.cmake @@ -20,10 +20,11 @@ exec_program(chmod ARGS ug+x \"${_filename}\" OUTPUT_VARIABLE _dummy ) else (UNIX) -file(TO_NATIVE_PATH ${_ld_library_path} win_path) +file(TO_NATIVE_PATH "${_ld_library_path}" win_path) + file(WRITE "${_filename}" " -set PATH=${win_path};${PATH} +set PATH=${win_path};$ENV{PATH} \"${_executable}\" %* ") |