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:06 (GMT)
commitf1b7e2d2589eecedf715c060ab96831fac242db8 (patch)
treec2b9e235da97cadbe7d0bf0e221b902011e16597
parent52f2d55ccb606465ac4325aab8c9cc1f9c844179 (diff)
parent9d6a080421e19a896aebfa8fe68160b456ea61eb (diff)
downloadCMake-f1b7e2d2589eecedf715c060ab96831fac242db8.zip
CMake-f1b7e2d2589eecedf715c060ab96831fac242db8.tar.gz
CMake-f1b7e2d2589eecedf715c060ab96831fac242db8.tar.bz2
Merge topic 'vs-android-api'
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)