diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2017-11-19 11:22:49 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2017-11-19 12:12:42 (GMT) |
| commit | ab9d5896ae43789872fca2e83d556912abb60254 (patch) | |
| tree | d18add395533b65ee0c04c59cf823553a82aaa33 /Source/cmQtAutoGeneratorRcc.cxx | |
| parent | 2a85b5ac768cde4a9bbe98551528c8bae1e268a8 (diff) | |
| download | CMake-ab9d5896ae43789872fca2e83d556912abb60254.zip CMake-ab9d5896ae43789872fca2e83d556912abb60254.tar.gz CMake-ab9d5896ae43789872fca2e83d556912abb60254.tar.bz2 | |
Autogen: Detect rcc feature once during configuration
We used to detect the `rcc` features before every `rcc` list invocation
wich resulted in `rcc` be called twice for every listing operation.
Now we detect the `rcc` list capabilities once during configuration and
pass it to the cmake_autorcc target in the info file.
Diffstat (limited to 'Source/cmQtAutoGeneratorRcc.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorRcc.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmQtAutoGeneratorRcc.cxx b/Source/cmQtAutoGeneratorRcc.cxx index 573f04c..3c9f1a8 100644 --- a/Source/cmQtAutoGeneratorRcc.cxx +++ b/Source/cmQtAutoGeneratorRcc.cxx @@ -78,8 +78,8 @@ bool cmQtAutoGeneratorRcc::InfoFileRead(cmMakefile* makefile) this->AutogenBuildDir = InfoGet("ARCC_BUILD_DIR"); // - Qt environment - this->QtMajorVersion = InfoGet("ARCC_QT_VERSION_MAJOR"); - this->RccExecutable = InfoGet("ARCC_QT_RCC_EXECUTABLE"); + this->RccExecutable = InfoGet("ARCC_RCC_EXECUTABLE"); + this->RccListOptions = InfoGetList("ARCC_RCC_LIST_OPTIONS"); // - Job this->QrcFile = InfoGet("ARCC_SOURCE"); @@ -135,6 +135,8 @@ void cmQtAutoGeneratorRcc::SettingsFileRead(cmMakefile* makefile) std::string str; str += this->RccExecutable; str += sep; + str += cmJoin(this->RccListOptions, ";"); + str += sep; str += this->QrcFile; str += sep; str += this->RccFile; @@ -307,7 +309,7 @@ bool cmQtAutoGeneratorRcc::RccGenerate() } else { // Read input file list from qrc file std::string error; - if (cmQtAutoGen::RccListInputs(this->QtMajorVersion, this->RccExecutable, + if (cmQtAutoGen::RccListInputs(this->RccExecutable, this->RccListOptions, this->QrcFile, readFiles, &error)) { files = &readFiles; } else { |