diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-30 12:42:55 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2016-12-06 14:59:27 (GMT) |
| commit | 9d9c68e21a09646816232fa849536ceaca106fc5 (patch) | |
| tree | 729d81ac4d755e91171a881b77b00a0fb08e96f0 | |
| parent | bb8c96689fe692196e8f77df6d071656b161b47c (diff) | |
| download | CMake-9d9c68e21a09646816232fa849536ceaca106fc5.zip CMake-9d9c68e21a09646816232fa849536ceaca106fc5.tar.gz CMake-9d9c68e21a09646816232fa849536ceaca106fc5.tar.bz2 | |
QtAutogen: Rename variable templates in config template
| -rw-r--r-- | Modules/AutogenInfo.cmake.in | 8 | ||||
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 9 |
2 files changed, 7 insertions, 10 deletions
diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in index 355d6d8..84b0f4d 100644 --- a/Modules/AutogenInfo.cmake.in +++ b/Modules/AutogenInfo.cmake.in @@ -1,6 +1,4 @@ set(AM_SOURCES @_cpp_files@ ) -set(AM_RCC_SOURCES @_rcc_files@ ) -set(AM_RCC_INPUTS @_qt_rcc_inputs@) set(AM_SKIP_MOC @_skip_moc@ ) set(AM_SKIP_UIC @_skip_uic@ ) set(AM_HEADERS @_moc_headers@ ) @@ -22,5 +20,7 @@ set(AM_ORIGIN_TARGET_NAME @_origin_target_name@) 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_RCC_OPTIONS_FILES @_qt_rcc_options_files@) -set(AM_RCC_OPTIONS_OPTIONS @_qt_rcc_options_options@) +set(AM_RCC_SOURCES @_rcc_files@ ) +set(AM_RCC_INPUTS @_rcc_inputs@) +set(AM_RCC_OPTIONS_FILES @_rcc_options_files@) +set(AM_RCC_OPTIONS_OPTIONS @_rcc_options_options@) diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index 4a7e814..4f20e1b 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -634,18 +634,15 @@ static void RccSetupAutoTarget(cmGeneratorTarget const* target) } } makefile->AddDefinition( - "_qt_rcc_inputs", cmOutputConverter::EscapeForCMake(qrcInputs).c_str()); - + "_rcc_inputs", cmOutputConverter::EscapeForCMake(qrcInputs).c_str()); makefile->AddDefinition( "_rcc_files", cmOutputConverter::EscapeForCMake(_rcc_files).c_str()); - makefile->AddDefinition( - "_qt_rcc_options_files", + "_rcc_options_files", cmOutputConverter::EscapeForCMake(rccFileFiles).c_str()); makefile->AddDefinition( - "_qt_rcc_options_options", + "_rcc_options_options", cmOutputConverter::EscapeForCMake(rccFileOptions).c_str()); - makefile->AddDefinition("_qt_rcc_executable", RccGetExecutable(target).c_str()); } |