|
|
@@ -446,6 +446,10 @@ void cmTarget::SetMakefile(cmMakefile* mf)
|
|
|
this->SetPropertyDefault("VISIBILITY_INLINES_HIDDEN", 0);
|
|
|
}
|
|
|
|
|
|
+ if(this->TargetTypeValue == cmTarget::EXECUTABLE)
|
|
|
+ {
|
|
|
+ this->SetPropertyDefault("ANDROID_GUI", 0);
|
|
|
+ }
|
|
|
if(this->TargetTypeValue == cmTarget::SHARED_LIBRARY
|
|
|
|| this->TargetTypeValue == cmTarget::MODULE_LIBRARY)
|
|
|
{
|
|
|
@@ -3504,7 +3508,10 @@ const char* cmTarget::GetSuffixVariableInternal(bool implib) const
|
|
|
case cmTarget::EXECUTABLE:
|
|
|
return (implib
|
|
|
? "CMAKE_IMPORT_LIBRARY_SUFFIX"
|
|
|
- : "CMAKE_EXECUTABLE_SUFFIX");
|
|
|
+ // Android GUI application packages store the native
|
|
|
+ // binary as a shared library.
|
|
|
+ : (this->IsAndroid && this->GetPropertyAsBool("ANDROID_GUI")?
|
|
|
+ "CMAKE_SHARED_LIBRARY_SUFFIX" : "CMAKE_EXECUTABLE_SUFFIX"));
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
|
@@ -3528,7 +3535,12 @@ const char* cmTarget::GetPrefixVariableInternal(bool implib) const
|
|
|
? "CMAKE_IMPORT_LIBRARY_PREFIX"
|
|
|
: "CMAKE_SHARED_MODULE_PREFIX");
|
|
|
case cmTarget::EXECUTABLE:
|
|
|
- return (implib? "CMAKE_IMPORT_LIBRARY_PREFIX" : "");
|
|
|
+ return (implib
|
|
|
+ ? "CMAKE_IMPORT_LIBRARY_PREFIX"
|
|
|
+ // Android GUI application packages store the native
|
|
|
+ // binary as a shared library.
|
|
|
+ : (this->IsAndroid && this->GetPropertyAsBool("ANDROID_GUI")?
|
|
|
+ "CMAKE_SHARED_LIBRARY_PREFIX" : ""));
|
|
|
default:
|
|
|
break;
|
|
|
}
|