Merge topic 'ios-combined-prune-archs'

5852b8867f CMakeIOSInstallCombined: Enforce disjoint architecture sets
79098d23eb Tests: Avoid warnings about unused arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5111
This commit is contained in:
Brad King
2020-08-17 18:52:03 +00:00
committed by Kitware Robot
4 changed files with 21 additions and 3 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
int main(int argc, const char* argv[])
int main()
{
return 0;
}
+1 -1
View File
@@ -1,3 +1,3 @@
int main(int argc, const char * argv[]) {
int main(void) {
return 1;
}