mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmQtAutoGenInitializer: Define CrossConfig variable

Browse Source
This commit is contained in:
Orkun Tokdemir
2023-06-29 17:00:36 +02:00
parent d4889361f0
commit cac2e029f0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmQtAutoGenInitializer.cxx
View File

@@ -332,6 +332,8 @@ cmQtAutoGenInitializer::cmQtAutoGenInitializer(
this->Uic.Enabled = uicEnabled;
this->Rcc.Enabled = rccEnabled;
this->Rcc.GlobalTarget = globalAutoRccTarget;
this->CrossConfig =
!this->Makefile->GetSafeDefinition("CMAKE_CROSS_CONFIGS").empty();
}
bool cmQtAutoGenInitializer::InitCustomTargets()
@@ -1026,8 +1028,7 @@ bool cmQtAutoGenInitializer::InitScanFiles()
if (this->MocOrUicEnabled() && !this->AutogenTarget.FilesGenerated.empty()) {
if (this->CMP0071Accept) {
// Let the autogen target depend on the GENERATED files
if (this->MultiConfig &&
this->Makefile->GetSafeDefinition("CMAKE_CROSS_CONFIGS").empty()) {
if (this->MultiConfig && !this->CrossConfig) {
for (MUFile const* muf : this->AutogenTarget.FilesGenerated) {
if (muf->Configs.empty()) {
this->AutogenTarget.DependFiles.insert(muf->FullPath);
@@ -1190,8 +1191,7 @@ bool cmQtAutoGenInitializer::InitAutogenTarget()
if (this->Moc.Enabled) {
this->AddGeneratedSource(this->Moc.CompilationFile, this->Moc, true);
if (useDepfile) {
if (this->MultiConfig &&
!this->Makefile->GetSafeDefinition("CMAKE_CROSS_CONFIGS").empty() &&
if (this->MultiConfig && this->CrossConfig &&
this->GlobalGen->GetName().find("Ninja") != std::string::npos) {
// Make all mocs_compilation_<CONFIG>.cpp files byproducts of the
// ${target}_autogen/timestamp custom command.
@@ -1239,7 +1239,7 @@ bool cmQtAutoGenInitializer::InitAutogenTarget()
this->GlobalGen->GetQtAutoGenConfigs(configs);
bool constexpr stdPipesUTF8 = true;
cmCustomCommandLines commandLines;
if (this->Makefile->GetSafeDefinition("CMAKE_CROSS_CONFIGS").empty()) {
if (!this->CrossConfig) {
std::string autogenInfoFileConfig;
if (this->MultiConfig) {
autogenInfoFileConfig = "$<CONFIG>";

1
Source/cmQtAutoGenInitializer.h
View File

@@ -167,6 +167,7 @@ private:
IntegerVersion QtVersion;
unsigned int Verbosity = 0;
bool MultiConfig = false;
bool CrossConfig = false;
bool CMP0071Accept = false;
bool CMP0071Warn = false;
bool CMP0100Accept = false;