|
@@ -4711,13 +4711,11 @@ bool cmTarget::IsNullImpliedByLinkLibraries(const std::string &p) const
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
//----------------------------------------------------------------------------
|
|
|
template<typename PropertyType>
|
|
template<typename PropertyType>
|
|
|
-PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop,
|
|
|
|
|
- PropertyType *);
|
|
|
|
|
|
|
+PropertyType getTypedProperty(cmTarget const* tgt, const std::string& prop);
|
|
|
|
|
|
|
|
//----------------------------------------------------------------------------
|
|
//----------------------------------------------------------------------------
|
|
|
template<>
|
|
template<>
|
|
|
-bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop,
|
|
|
|
|
- bool *)
|
|
|
|
|
|
|
+bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop)
|
|
|
{
|
|
{
|
|
|
return tgt->GetPropertyAsBool(prop);
|
|
return tgt->GetPropertyAsBool(prop);
|
|
|
}
|
|
}
|
|
@@ -4725,8 +4723,7 @@ bool getTypedProperty<bool>(cmTarget const* tgt, const std::string& prop,
|
|
|
//----------------------------------------------------------------------------
|
|
//----------------------------------------------------------------------------
|
|
|
template<>
|
|
template<>
|
|
|
const char *getTypedProperty<const char *>(cmTarget const* tgt,
|
|
const char *getTypedProperty<const char *>(cmTarget const* tgt,
|
|
|
- const std::string& prop,
|
|
|
|
|
- const char **)
|
|
|
|
|
|
|
+ const std::string& prop)
|
|
|
{
|
|
{
|
|
|
return tgt->GetProperty(prop);
|
|
return tgt->GetProperty(prop);
|
|
|
}
|
|
}
|
|
@@ -4937,8 +4934,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
|
|
|
CompatibleType t,
|
|
CompatibleType t,
|
|
|
PropertyType *)
|
|
PropertyType *)
|
|
|
{
|
|
{
|
|
|
- PropertyType propContent = getTypedProperty<PropertyType>(tgt, p,
|
|
|
|
|
- 0);
|
|
|
|
|
|
|
+ PropertyType propContent = getTypedProperty<PropertyType>(tgt, p);
|
|
|
const bool explicitlySet = tgt->GetProperties()
|
|
const bool explicitlySet = tgt->GetProperties()
|
|
|
.find(p)
|
|
.find(p)
|
|
|
!= tgt->GetProperties().end();
|
|
!= tgt->GetProperties().end();
|
|
@@ -4991,7 +4987,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
|
|
|
!= theTarget->GetProperties().end();
|
|
!= theTarget->GetProperties().end();
|
|
|
PropertyType ifacePropContent =
|
|
PropertyType ifacePropContent =
|
|
|
getTypedProperty<PropertyType>(theTarget,
|
|
getTypedProperty<PropertyType>(theTarget,
|
|
|
- interfaceProperty, 0);
|
|
|
|
|
|
|
+ interfaceProperty);
|
|
|
|
|
|
|
|
std::string reportEntry;
|
|
std::string reportEntry;
|
|
|
if (ifaceIsSet)
|
|
if (ifaceIsSet)
|