diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-02 14:26:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-03-02 14:26:13 (GMT) |
| commit | c1fb7213edaf512774eb74adb0a89b4984f88904 (patch) | |
| tree | 98b0418a4773c045e257d20eac411db6be200c01 /Modules | |
| parent | 6c332bd84ce320e4163130a052af7b9950b38318 (diff) | |
| parent | 3bf28f5ed057b2fe4d90c601065188055bb052a1 (diff) | |
| download | CMake-c1fb7213edaf512774eb74adb0a89b4984f88904.zip CMake-c1fb7213edaf512774eb74adb0a89b4984f88904.tar.gz CMake-c1fb7213edaf512774eb74adb0a89b4984f88904.tar.bz2 | |
Merge topic 'autogen_uic_paths'
3bf28f5e Autogen: New short InfoGet functions
154d8339 Autogen: Parse enabled feature configuration only
ac77fa35 Autogen: Add missing return on error
662ad240 Autogen: Rename and merge moc related methods
5adf22bb Autogen: Add AUTOUIC_SEARCH_PATHS release notes
36fa535d Autogen: Add AUTOUIC_SEARCH_PATHS documentation
6d7c02db Autogen: Add AUTOUIC_SEARCH_PATHS test
1cdf7c1b Autogen: Add AUTOUIC_SEARCH_PATHS support
110c1bf4 Autogen: Add subDirPrefix function
db431ecf Autogen: Merge FindInIncludeDirectories into FindIncludeFile
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/AutogenInfo.cmake.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in index fc5024f..fcecb6c 100644 --- a/Modules/AutogenInfo.cmake.in +++ b/Modules/AutogenInfo.cmake.in @@ -16,7 +16,7 @@ set(AM_QT_UIC_EXECUTABLE @_qt_uic_executable@) set(AM_QT_RCC_EXECUTABLE @_qt_rcc_executable@) # MOC settings set(AM_MOC_SKIP @_moc_skip@) -set(AM_MOC_COMPILE_DEFINITIONS @_moc_compile_defs@) +set(AM_MOC_DEFINITIONS @_moc_compile_defs@) set(AM_MOC_INCLUDES @_moc_incs@) set(AM_MOC_OPTIONS @_moc_options@) set(AM_MOC_RELAXED_MODE @_moc_relaxed_mode@) @@ -26,6 +26,7 @@ set(AM_UIC_SKIP @_uic_skip@) 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@) +set(AM_UIC_SEARCH_PATHS @_uic_search_paths@) # RCC settings set(AM_RCC_SOURCES @_rcc_files@ ) set(AM_RCC_INPUTS @_rcc_inputs@) |