mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 11:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Android.mk: Evaluate generator expressions up front

Browse Source 
When exporting `INTERFACE_LINK_LIBRARIES`, we must evaluate generator
expressions first, before expanding the `;` list, in case they contain
or generate semicolons.
This commit is contained in:
Brad King
2018-02-14 11:09:55 -05:00
parent 9c1efb614d
commit 56e1688517
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmExportBuildAndroidMKGenerator.cxx
+13 -12
View File
@@ -101,12 +101,19 @@ void cmExportBuildAndroidMKGenerator::GenerateInterfaceProperties(
os << "LOCAL_CPP_FEATURES += "; os << "LOCAL_CPP_FEATURES += ";
os << (property.second) << "\n"; os << (property.second) << "\n";
} else if (property.first == "INTERFACE_LINK_LIBRARIES") { } else if (property.first == "INTERFACE_LINK_LIBRARIES") {
// evaluate any generator expressions with the current
// build type of the makefile
cmGeneratorExpression ge;
std::unique_ptr<cmCompiledGeneratorExpression> cge =
ge.Parse(property.second);
std::string evaluated =
cge->Evaluate(target->GetLocalGenerator(), config);
// need to look at list in pi->second and see if static or shared // need to look at list in pi->second and see if static or shared
// FindTargetToLink // FindTargetToLink
// target->GetLocalGenerator()->FindGeneratorTargetToUse() // target->GetLocalGenerator()->FindGeneratorTargetToUse()
// then add to LOCAL_CPPFLAGS // then add to LOCAL_CPPFLAGS
std::vector<std::string> libraries; std::vector<std::string> libraries;
cmSystemTools::ExpandListArgument(property.second, libraries); cmSystemTools::ExpandListArgument(evaluated, libraries);
std::string staticLibs; std::string staticLibs;
std::string sharedLibs; std::string sharedLibs;
std::string ldlibs; std::string ldlibs;
@@ -122,12 +129,6 @@ void cmExportBuildAndroidMKGenerator::GenerateInterfaceProperties(
staticLibs += " " + lib; staticLibs += " " + lib;
} }
} else { } else {
// evaluate any generator expressions with the current
// build type of the makefile
cmGeneratorExpression ge;
std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(lib);
std::string evaluated =
cge->Evaluate(target->GetLocalGenerator(), config);
bool relpath = false; bool relpath = false;
if (type == cmExportBuildAndroidMKGenerator::INSTALL) { if (type == cmExportBuildAndroidMKGenerator::INSTALL) {
relpath = lib.substr(0, 3) == "../"; relpath = lib.substr(0, 3) == "../";
@@ -135,12 +136,12 @@ void cmExportBuildAndroidMKGenerator::GenerateInterfaceProperties(
// check for full path or if it already has a -l, or // check for full path or if it already has a -l, or
// in the case of an install check for relative paths // in the case of an install check for relative paths
// if it is full or a link library then use string directly // if it is full or a link library then use string directly
if (cmSystemTools::FileIsFullPath(evaluated) || if (cmSystemTools::FileIsFullPath(lib) ||
evaluated.substr(0, 2) == "-l" || relpath) { lib.substr(0, 2) == "-l" || relpath) {
ldlibs += " " + evaluated; ldlibs += " " + lib;
// if it is not a path and does not have a -l then add -l // if it is not a path and does not have a -l then add -l
} else if (!evaluated.empty()) { } else if (!lib.empty()) {
ldlibs += " -l" + evaluated; ldlibs += " -l" + lib;
} }
} }
} }