kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'find-package-mode-fixes'

Browse Source 
a098ca0d cmake: Fix --find-package mode link line output
d9c600c5 cmGlobalGenerator: Fix use of uninitialized value in --find-package mode
This commit is contained in:
Brad King 2016-09-19 08:55:03 -04:00 committed by CMake Topic Stage
commit b4ea74c5ca
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalGenerator.cxx
View File

@ -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);

4
Source/cmake.cxx
View File

@ -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());