BUG: kde3: use QT_UIC_EXECUTABLE instead of simply uic
BUG: use qouting for the path to Qt4 moc and uic, should help with paths with spaces Alex
This commit is contained in:
parent
7d0bc9541d
commit
a86c766d2a
|
@ -655,8 +655,8 @@ IF (QT4_QMAKE_FOUND)
|
|||
STRING(REGEX REPLACE ".*MOC<([^>]+).*" "\\1" QT_MOC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
|
||||
STRING(REGEX REPLACE ".*UIC<([^>]+).*" "\\1" QT_UIC_EXECUTABLE_INTERNAL "${_moc_OUTPUT}" )
|
||||
|
||||
FILE(TO_CMAKE_PATH ${QT_MOC_EXECUTABLE_INTERNAL} QT_MOC_EXECUTABLE_INTERNAL)
|
||||
FILE(TO_CMAKE_PATH ${QT_UIC_EXECUTABLE_INTERNAL} QT_UIC_EXECUTABLE_INTERNAL)
|
||||
FILE(TO_CMAKE_PATH "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
|
||||
FILE(TO_CMAKE_PATH "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
|
||||
|
||||
SET(QT_MOC_EXECUTABLE ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
|
||||
SET(QT_UIC_EXECUTABLE ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
|
||||
|
|
|
@ -170,9 +170,10 @@ MACRO(KDE3_ADD_UI_FILES _sources )
|
|||
ADD_CUSTOM_COMMAND(OUTPUT ${_src}
|
||||
COMMAND ${CMAKE_COMMAND}
|
||||
ARGS
|
||||
-DKDE_UIC_FILE:STRING=${_tmp_FILE}
|
||||
-DKDE_UIC_CPP_FILE:STRING=${_src}
|
||||
-DKDE_UIC_H_FILE:STRING=${_header}
|
||||
-DKDE_UIC_EXECUTABLE:FILEPATH=${QT_UIC_EXECUTABLE}
|
||||
-DKDE_UIC_FILE:FILEPATH=${_tmp_FILE}
|
||||
-DKDE_UIC_CPP_FILE:FILEPATH=${_src}
|
||||
-DKDE_UIC_H_FILE:FILEPATH=${_header}
|
||||
-P ${KDE3_MODULE_DIR}/kde3uic.cmake
|
||||
DEPENDS ${_header}
|
||||
)
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
# neundorf@kde.org
|
||||
|
||||
|
||||
EXECUTE_PROCESS(COMMAND uic
|
||||
EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE}
|
||||
-nounload -tr tr2i18n
|
||||
-impl ${KDE_UIC_H_FILE}
|
||||
${KDE_UIC_FILE}
|
||||
|
|
Loading…
Reference in New Issue