diff options
author | Alexander Neundorf <neundorf@kde.org> | 2006-01-19 22:50:30 +0000 |
---|---|---|
committer | Alexander Neundorf <neundorf@kde.org> | 2006-01-19 22:50:30 +0000 |
commit | a6f951a920cc9b57aa36285d1201f7ebf0ad0265 (patch) | |
tree | 952d265a78305365f3c700db58c4a4e1e78d5de0 /kde4/kde4uic.cmake | |
parent | c29a1bb8aa8d711e591dc103c29f6a70c51b8895 (diff) | |
download | extra-cmake-modules-a6f951a920cc9b57aa36285d1201f7ebf0ad0265.tar.gz extra-cmake-modules-a6f951a920cc9b57aa36285d1201f7ebf0ad0265.tar.bz2 |
-fix ui3 handling
Alex
svn path=/trunk/KDE/kdesdk/cmake/; revision=500305
Diffstat (limited to 'kde4/kde4uic.cmake')
-rw-r--r-- | kde4/kde4uic.cmake | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/kde4/kde4uic.cmake b/kde4/kde4uic.cmake index c51a8ae5..60fa6b9b 100644 --- a/kde4/kde4uic.cmake +++ b/kde4/kde4uic.cmake @@ -1,6 +1,6 @@ #using a ui3 file with uic3 -IF(KDE3) +IF(KDE3_IMPL) EXEC_PROGRAM(${KDE_UIC_EXECUTABLE} ARGS -nounload -tr tr2i18n @@ -8,19 +8,30 @@ IF(KDE3) ${KDE_UIC_FILE} OUTPUT_VARIABLE _uic_CONTENTS ) +ENDIF(KDE3_IMPL) + + +IF(KDE3_HEADER) + + EXEC_PROGRAM(${KDE_UIC_EXECUTABLE} ARGS + -nounload -tr tr2i18n + ${KDE_UIC_FILE} + OUTPUT_VARIABLE _uic_CONTENTS + ) + SET(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) +ENDIF(KDE3_HEADER) # the kde4 branch -ELSE(KDE3) +IF (KDE4_HEADER) EXEC_PROGRAM(${KDE_UIC_EXECUTABLE} ARGS -tr tr2i18n - -L ${KDE_UIC_PLUGIN_DIR} - -impl ${KDE_UIC_H_FILE} ${KDE_UIC_FILE} OUTPUT_VARIABLE _uic_CONTENTS ) -ENDIF(KDE3) + SET(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) +ENDIF (KDE4_HEADER) #replace tr218n("") with QString::null to avoid waring from KLocale @@ -30,6 +41,5 @@ STRING(REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _uic_CONTENTS "${ #replace image15_data with img15_filename to make enable_final work STRING(REGEX REPLACE "image([0-9]+)_data" "img\\1_${KDE_UIC_BASENAME}" _uic_CONTENTS "${_uic_CONTENTS}") -FILE(WRITE ${KDE_UIC_CPP_FILE} "#include <kdialog.h>\n#include <klocale.h>\n\n") -FILE(APPEND ${KDE_UIC_CPP_FILE} "${_uic_CONTENTS}") +FILE(WRITE ${KDE_UIC_CPP_FILE} "#include <kdialog.h>\n#include <klocale.h>\n\n${_uic_CONTENTS}\n") |