|
|
@@ -447,8 +447,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
|
|
|
(cmSystemTools::GetCurrentWorkingDirectory());
|
|
|
// read in the list file to fill the cache
|
|
|
snapshot.SetDefaultDefinitions();
|
|
|
- cmsys::auto_ptr<cmMakefile> mf(new cmMakefile(gg, snapshot));
|
|
|
- cmsys::auto_ptr<cmLocalGenerator> lg(gg->CreateLocalGenerator(mf.get()));
|
|
|
+ cmMakefile* mf = new cmMakefile(gg, snapshot);
|
|
|
+ gg->AddMakefile(mf);
|
|
|
|
|
|
mf->SetArgcArgv(args);
|
|
|
|
|
|
@@ -481,6 +481,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
|
|
|
std::vector<std::string> includeDirs;
|
|
|
cmSystemTools::ExpandListArgument(includes, includeDirs);
|
|
|
|
|
|
+ gg->CreateGenerationObjects();
|
|
|
+ cmLocalGenerator* lg = gg->LocalGenerators[0];
|
|
|
std::string includeFlags = lg->GetIncludeFlags(includeDirs, 0, language);
|
|
|
|
|
|
std::string definitions = mf->GetSafeDefinition("PACKAGE_DEFINITIONS");
|
|
|
@@ -510,8 +512,9 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
|
|
|
std::string linkPath;
|
|
|
std::string flags;
|
|
|
std::string linkFlags;
|
|
|
- gg->CreateGeneratorTargets(cmGlobalGenerator::AllTargets, lg.get());
|
|
|
- cmGeneratorTarget *gtgt = gg->GetGeneratorTarget(tgt);
|
|
|
+ gg->CreateGenerationObjects();
|
|
|
+ cmGeneratorTarget *gtgt = gg->FindGeneratorTarget(tgt->GetName());
|
|
|
+ cmLocalGenerator* lg = gtgt->GetLocalGenerator();
|
|
|
lg->GetTargetFlags(linkLibs, frameworkPath, linkPath, flags, linkFlags,
|
|
|
gtgt, false);
|
|
|
linkLibs = frameworkPath + linkPath + linkLibs;
|