Merge topic 'find-package-mode-fixes'
a098ca0d
cmake: Fix --find-package mode link line outputd9c600c5
cmGlobalGenerator: Fix use of uninitialized value in --find-package mode
This commit is contained in:
commit
b4ea74c5ca
|
@ -94,6 +94,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
|
|||
this->TryCompileOuterMakefile = CM_NULLPTR;
|
||||
|
||||
this->ConfigureDoneCMP0026AndCMP0024 = false;
|
||||
this->FirstTimeProgress = 0.0f;
|
||||
|
||||
cm->GetState()->SetMinGWMake(false);
|
||||
cm->GetState()->SetMSYSShell(false);
|
||||
|
|
|
@ -595,8 +595,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
|
|||
gg->CreateGenerationObjects();
|
||||
cmGeneratorTarget* gtgt = gg->FindGeneratorTarget(tgt->GetName());
|
||||
cmLocalGenerator* lg = gtgt->GetLocalGenerator();
|
||||
lg->GetTargetFlags(buildType, linkLibs, frameworkPath, linkPath, flags,
|
||||
linkFlags, gtgt, false);
|
||||
lg->GetTargetFlags(buildType, linkLibs, flags, linkFlags, frameworkPath,
|
||||
linkPath, gtgt, false);
|
||||
linkLibs = frameworkPath + linkPath + linkLibs;
|
||||
|
||||
printf("%s\n", linkLibs.c_str());
|
||||
|
|
Loading…
Reference in New Issue