diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-04 12:15:29 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-04 12:15:29 +0000 |
| commit | fb0d05a8363b1f37c24f995b9565cb90c8625256 (patch) | |
| tree | f1cadba99909fb7577f86cc0e860a378b4a6a17d /modules/kde4uic.cmake | |
| parent | 817117aaa55be6d5c8ef3867630c9a9545da5520 (diff) | |
| download | extra-cmake-modules-fb0d05a8363b1f37c24f995b9565cb90c8625256.tar.gz extra-cmake-modules-fb0d05a8363b1f37c24f995b9565cb90c8625256.tar.bz2 | |
-renamed optional_find_package() to macro_optional_find_package(), to make it clear it is a macro and not a builtin command
-kjsembed compiles
-CheckCXXSourceCompiles now support multiple include paths
-compile fix in kjsembed/value_binding.cpp: prefer the local global.h, otherwise it might end up with the global.h from kio/kio/, depending on the order of include directories
-use the new "-o" switch for dcopidl
-add a (temporary) workaround for David's uic problem
Alex
svn path=/trunk/KDE/kdelibs/; revision=505580
The following changes were in SVN, but were removed from git:
M pics/CMakeLists.txt
Diffstat (limited to 'modules/kde4uic.cmake')
| -rw-r--r-- | modules/kde4uic.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/kde4uic.cmake b/modules/kde4uic.cmake index 42382aac..16bce3a8 100644 --- a/modules/kde4uic.cmake +++ b/modules/kde4uic.cmake @@ -37,11 +37,15 @@ ENDIF (KDE4_HEADER) #replace tr218n("") with QString::null to avoid waring from KLocale STRING(REGEX REPLACE "tr2i18n\\(\"\"\\)" "QString::null" _uic_CONTENTS "${_uic_CONTENTS}" ) STRING(REGEX REPLACE "tr2i18n\\(\"\", \"\"\\)" "QString::null" _uic_CONTENTS "${_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 "\nuic3: [^\n]+" "" _uic_CONTENTS "${_uic_CONTENTS}" ) STRING(REGEX REPLACE "\n'[^\n]+' [^\n]+" "" _uic_CONTENTS "${_uic_CONTENTS}" ) +STRING(REGEX REPLACE "\nWarning: [^\n]+" "" _uic_CONTENTS "${_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${_uic_CONTENTS}\n") |