Commit b4ea74c5 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'find-package-mode-fixes'

a098ca0d cmake: Fix --find-package mode link line output
d9c600c5 cmGlobalGenerator: Fix use of uninitialized value in --find-package mode
parents 009bb013 a098ca0d
...@@ -94,6 +94,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm) ...@@ -94,6 +94,7 @@ cmGlobalGenerator::cmGlobalGenerator(cmake* cm)
this->TryCompileOuterMakefile = CM_NULLPTR; this->TryCompileOuterMakefile = CM_NULLPTR;
this->ConfigureDoneCMP0026AndCMP0024 = false; this->ConfigureDoneCMP0026AndCMP0024 = false;
this->FirstTimeProgress = 0.0f;
cm->GetState()->SetMinGWMake(false); cm->GetState()->SetMinGWMake(false);
cm->GetState()->SetMSYSShell(false); cm->GetState()->SetMSYSShell(false);
......
...@@ -595,8 +595,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args) ...@@ -595,8 +595,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
gg->CreateGenerationObjects(); gg->CreateGenerationObjects();
cmGeneratorTarget* gtgt = gg->FindGeneratorTarget(tgt->GetName()); cmGeneratorTarget* gtgt = gg->FindGeneratorTarget(tgt->GetName());
cmLocalGenerator* lg = gtgt->GetLocalGenerator(); cmLocalGenerator* lg = gtgt->GetLocalGenerator();
lg->GetTargetFlags(buildType, linkLibs, frameworkPath, linkPath, flags, lg->GetTargetFlags(buildType, linkLibs, flags, linkFlags, frameworkPath,
linkFlags, gtgt, false); linkPath, gtgt, false);
linkLibs = frameworkPath + linkPath + linkLibs; linkLibs = frameworkPath + linkPath + linkLibs;
printf("%s\n", linkLibs.c_str()); printf("%s\n", linkLibs.c_str());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment