Commit a098ca0d authored by Brad King's avatar Brad King
Browse files

cmake: Fix --find-package mode link line output

Refactoring in commit v2.8.10~58^2~2 (Ninja: move -LIBPATH behind -link
option, 2012-09-26) added arguments to cmLocalGenerator::GetTargetFlags
and updated the call sites.  However, in the cmake::FindPackage and
cmLocalGenerator::AddBuildTargetRule call sites it added the new
arguments in the wrong order.  The latter was never used and has been
removed.  The former remains buggy and prints out compiler flags instead
of the link framework/library search paths.  Fix its argument order.
parent d9c600c5
......@@ -595,8 +595,8 @@ bool cmake::FindPackage(const std::vector<std::string>& args)
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());
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