diff options
| author | Matthias Kretz <kretz@kde.org> | 2006-04-05 21:41:58 +0000 |
|---|---|---|
| committer | Matthias Kretz <kretz@kde.org> | 2006-04-05 21:41:58 +0000 |
| commit | da6e4bab60f1eb24fc612e98266c85697d4167d4 (patch) | |
| tree | 7bc65a64c215a6257d93c7a247a6d2aa4881a858 /modules | |
| parent | f5ff2b2a995c43f2a62b128ab461ce515fa31ee5 (diff) | |
| download | extra-cmake-modules-da6e4bab60f1eb24fc612e98266c85697d4167d4.tar.gz extra-cmake-modules-da6e4bab60f1eb24fc612e98266c85697d4167d4.tar.bz2 | |
Prefix generated header files with ui_ for designer4 ui files.
Adjust the includes accordingly (I hope I found all of them, at least kdelibs
compiles here - except for kate/tests/arbitraryhighlighttest.cpp)
Be careful when using foo.ui, foo.h, foo.cpp now, though because uic puts
a very general include guard macro in the generated file: FOO_H
Most people (and kde-devel-vim.vim's ,i) will use the same macro for foo.h.
This will hopefully be fixable when Trolltech extends uic so that we don't
have to postprocess the output anymore. (The -o option of uic creates the
include guard from the name of the output file.)
svn path=/trunk/KDE/kdelibs/; revision=526900
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/KDE4Macros.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index f05d10d3..023f552b 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -138,7 +138,7 @@ MACRO (KDE4_ADD_UI_FILES _sources ) GET_FILENAME_COMPONENT(_tmp_FILE ${_current_FILE} ABSOLUTE) GET_FILENAME_COMPONENT(_basename ${_tmp_FILE} NAME_WE) - SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) + SET(_header ${CMAKE_CURRENT_BINARY_DIR}/ui_${_basename}.h) # we need to run uic and replace some things in the generated file # this is done by executing the cmake script kde4uic.cmake |