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

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.
This commit is contained in:
Brad King 2016-09-16 09:49:25 -04:00
parent d9c600c504
commit a098ca0d7a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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