From fb0d05a8363b1f37c24f995b9565cb90c8625256 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 4 Feb 2006 12:15:29 +0000 Subject: -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 --- modules/kde4uic.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'modules/kde4uic.cmake') 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 \n#include \n\n${_uic_CONTENTS}\n") -- cgit v1.2.1