diff options
Diffstat (limited to 'kde4')
| -rw-r--r-- | kde4/KDE4Macros.cmake | 5 | ||||
| -rw-r--r-- | kde4/kde4uic.cmake | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/kde4/KDE4Macros.cmake b/kde4/KDE4Macros.cmake index fae370b9..10370a60 100644 --- a/kde4/KDE4Macros.cmake +++ b/kde4/KDE4Macros.cmake @@ -262,7 +262,10 @@ MACRO(KDE4_AUTOMOC) SET(_tmp_FILE ${CMAKE_CURRENT_SOURCE_DIR}/${_current_FILE}) ENDIF(${_current_FILE} MATCHES "^/.+") +#message(STATUS "file: ${_tmp_FILE}") + IF (EXISTS ${_tmp_FILE}) +#message(STATUS "exists") FILE(READ ${_tmp_FILE} _contents) @@ -271,7 +274,9 @@ MACRO(KDE4_AUTOMOC) STRING(REGEX MATCHALL "#include +[^ ]+\\.moc[\">]" _match "${_contents}") IF(_match) +#message(STATUS "match 1") FOREACH (_current_MOC_INC ${_match}) +#message(STATUS "match 2") STRING(REGEX MATCH "[^ <\"]+\\.moc" _current_MOC "${_current_MOC_INC}") GET_FILENAME_COMPONENT(_basename ${_current_MOC} NAME_WE) diff --git a/kde4/kde4uic.cmake b/kde4/kde4uic.cmake index 60fa6b9b..42382aac 100644 --- a/kde4/kde4uic.cmake +++ b/kde4/kde4uic.cmake @@ -37,6 +37,8 @@ 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}" ) +STRING(REGEX REPLACE "\nuic3: [^\n]+" "" _uic_CONTENTS "${_uic_CONTENTS}" ) +STRING(REGEX REPLACE "\n'[^\n]+' [^\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}") |