diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-11 16:50:25 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-11 16:50:25 +0000 |
| commit | 68e472fabed37bd21e22ec58af4a0ce6d7a25720 (patch) | |
| tree | 4a34d5570ab431abfb9f782c3579f5da252ec3e3 /modules/kde4uic.cmake | |
| parent | b9244b697c9abe1e40a3f8f3068830338c61a70b (diff) | |
| download | extra-cmake-modules-68e472fabed37bd21e22ec58af4a0ce6d7a25720.tar.gz extra-cmake-modules-68e472fabed37bd21e22ec58af4a0ce6d7a25720.tar.bz2 | |
now cmake 2.3.3 is required, if you have an older version, you get a warning
KDE cmake files are now workaround-free (if I didn't forget any):
-use GET_FILENAME_COMPONENT(... ABSOLUTE) instead of QT4_GET_ABS_PATH()
-use the new EXECUTE_PROCESS() instead of EXEC_PROGRAM() which discards stderr output
-use check_symbol_exists() instead of check_function_exists() since this works better (mainly various windows issues)
-use the new WORKING_DIRECTORY argument for ADD_CUSTOM_COMMAND() instead of cmake -E chdir ...
Alex
svn path=/trunk/KDE/kdelibs/; revision=508407
Diffstat (limited to 'modules/kde4uic.cmake')
| -rw-r--r-- | modules/kde4uic.cmake | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/modules/kde4uic.cmake b/modules/kde4uic.cmake index fe1e6b6c..4d33e60d 100644 --- a/modules/kde4uic.cmake +++ b/modules/kde4uic.cmake @@ -2,21 +2,23 @@ #using a ui3 file with uic3 IF(KDE3_IMPL) - EXEC_PROGRAM(${KDE_UIC_EXECUTABLE} ARGS + EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} -nounload -tr tr2i18n -impl ${KDE_UIC_H_FILE} ${KDE_UIC_FILE} OUTPUT_VARIABLE _uic_CONTENTS + ERROR_QUIET ) ENDIF(KDE3_IMPL) IF(KDE3_HEADER) - EXEC_PROGRAM(${KDE_UIC_EXECUTABLE} ARGS + EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} -nounload -tr tr2i18n ${KDE_UIC_FILE} OUTPUT_VARIABLE _uic_CONTENTS + ERROR_QUIET ) SET(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) ENDIF(KDE3_HEADER) @@ -24,10 +26,11 @@ ENDIF(KDE3_HEADER) # the kde4 branch IF (KDE4_HEADER) - EXEC_PROGRAM(${KDE_UIC_EXECUTABLE} ARGS + EXECUTE_PROCESS(COMMAND ${KDE_UIC_EXECUTABLE} -tr tr2i18n ${KDE_UIC_FILE} OUTPUT_VARIABLE _uic_CONTENTS + ERROR_QUIET ) SET(KDE_UIC_CPP_FILE ${KDE_UIC_H_FILE}) @@ -40,12 +43,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}") -# workaround which removes the stderr messages from uic, will be removed as soon as -# I switch to EXEC_PROCESS() in the calls above -STRING(REGEX REPLACE "\n[^\n]*uic3: [^\n]+" "" _uic_CONTENTS "${_uic_CONTENTS}" ) -STRING(REGEX REPLACE "\n'[^\n]+' [^\n]+" "" _uic_CONTENTS "${_uic_CONTENTS}" ) -STRING(REGEX REPLACE "\nWarning: [^\n]+" "" _uic_CONTENTS "${_uic_CONTENTS}" ) - - FILE(WRITE ${KDE_UIC_CPP_FILE} "#include <kdialog.h>\n#include <klocale.h>\n\n${_uic_CONTENTS}\n") |