diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-07-25 07:24:53 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-10-24 10:30:38 (GMT) |
| commit | 84218e1870ab075c9e2be1f2947358702c849fed (patch) | |
| tree | bf9c4c40c03ef8d5e07340457969b5181b7ef458 /Modules | |
| parent | 94a0ca604ca6ba3699b6d309938e881b2a3984a0 (diff) | |
| download | CMake-84218e1870ab075c9e2be1f2947358702c849fed.zip CMake-84218e1870ab075c9e2be1f2947358702c849fed.tar.gz CMake-84218e1870ab075c9e2be1f2947358702c849fed.tar.bz2 | |
Add automatic uic invocation for Qt.
The source files are already processed by cmQtAutomoc to look for
moc includes, so extend that to also look for ui_ includes and
find corresponding .ui files to process.
This replaces the need to invoke qt4_wrap_ui().
As the ui files are not likely to be part of the SOURCES of the
target, store the options associated with them separately in the
cmMakefile for querying during the autogen run.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/AutogenInfo.cmake.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in index 19663ff..d2fb807 100644 --- a/Modules/AutogenInfo.cmake.in +++ b/Modules/AutogenInfo.cmake.in @@ -1,5 +1,6 @@ set(AM_SOURCES @_moc_files@ ) set(AM_SKIP_MOC @_skip_moc@ ) +set(AM_SKIP_UIC @_skip_uic@ ) set(AM_HEADERS @_moc_headers@ ) set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@) set(AM_MOC_INCLUDES @_moc_incs@) @@ -8,8 +9,12 @@ set(AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE "@CMAKE_INCLUDE_DIRECTORIES_PROJ set(AM_CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@/") set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/") set(AM_QT_MOC_EXECUTABLE "@_qt_moc_executable@") +set(AM_QT_UIC_EXECUTABLE "@_qt_uic_executable@") set(AM_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") set(AM_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/") set(AM_QT_VERSION_MAJOR "@_target_qt_version@") set(AM_TARGET_NAME @_moc_target_name@) set(AM_RELAXED_MODE "@_moc_relaxed_mode@") +set(AM_UIC_TARGET_OPTIONS @_uic_target_options@) +set(AM_UIC_OPTIONS_FILES @_qt_uic_options_files@) +set(AM_UIC_OPTIONS_OPTIONS @_qt_uic_options_options@) |