summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-06-09 13:22:54 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-06-09 13:23:05 (GMT)
commit84da420a29155e206cef48fc7b05bf818539feb6 (patch)
treeef68f7b28e73388568a66192173edcd9b977c2a6
parent9d43059132dd0506e7be6dd5a1310a32efbeddb5 (diff)
parent9d6a080421e19a896aebfa8fe68160b456ea61eb (diff)
downloadCMake-84da420a29155e206cef48fc7b05bf818539feb6.zip
CMake-84da420a29155e206cef48fc7b05bf818539feb6.tar.gz
CMake-84da420a29155e206cef48fc7b05bf818539feb6.tar.bz2
Merge topic 'vs-android-api' into release-3.24
9d6a080421 VS: Add AndroidAPILevel element to generated project files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !7339
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 60b89df..c79331c 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1639,6 +1639,10 @@ void cmVisualStudio10TargetGenerator::WriteAndroidConfigurationValues(
e1.Element("UseOfStl", *stlType);
}
}
+ std::string const& apiLevel = gg->GetSystemVersion();
+ if (!apiLevel.empty()) {
+ e1.Element("AndroidAPILevel", cmStrCat("android-", apiLevel));
+ }
}
void cmVisualStudio10TargetGenerator::WriteCustomCommands(Elem& e0)