kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure type specific compatible interface properties do not intersect. 

Before, the boolean version would always win, and the string one would
be ignored.
This commit is contained in:
Stephen Kelly 2013-02-07 00:47:31 +01:00
parent 46e28960a5
commit 655e98bf71
5 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/cmTarget.cxx
View File

@ -906,7 +906,10 @@ void cmTarget::DefineProperties(cmake *cm)
"consistent with each other, and with the \"FOO\" property in the "
"dependee. Consistency in this sense has the meaning that if the "
"property is set, then it must have the same boolean value as all "
"others, and if the property is not set, then it is ignored.");
"others, and if the property is not set, then it is ignored. Note that "
"for each dependee, the set of properties from this property must not "
"intersect with the set of properties from the "
"COMPATIBLE_INTERFACE_STRING property.");
cm->DefineProperty
("COMPATIBLE_INTERFACE_STRING", cmProperty::TARGET,
@ -917,7 +920,10 @@ void cmTarget::DefineProperties(cmake *cm)
"if a property \"FOO\" appears in the list, then for each dependee, the "
"\"INTERFACE_FOO\" property content in all of its dependencies must be "
"equal with each other, and with the \"FOO\" property in the dependee. "
"If the property is not set, then it is ignored.");
"If the property is not set, then it is ignored. Note that for each "
"dependee, the set of properties from this property must not intersect "
"with the set of properties from the COMPATIBLE_INTERFACE_BOOL "
"property.");
cm->DefineProperty
("POST_INSTALL_SCRIPT", cmProperty::TARGET,
@ -5616,7 +5622,8 @@ void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
{
const cmComputeLinkInformation::ItemVector &deps = info->GetItems();
std::set<cmStdString> emitted;
std::set<cmStdString> emittedBools;
std::set<cmStdString> emittedStrings;
for(cmComputeLinkInformation::ItemVector::const_iterator li =
deps.begin();
@ -5629,19 +5636,36 @@ void cmTarget::CheckPropertyCompatibility(cmComputeLinkInformation *info,
checkPropertyConsistency<bool>(this, li->Target,
"COMPATIBLE_INTERFACE_BOOL",
emitted, config, 0);
emittedBools, config, 0);
if (cmSystemTools::GetErrorOccuredFlag())
{
return;
}
checkPropertyConsistency<const char *>(this, li->Target,
"COMPATIBLE_INTERFACE_STRING",
emitted, config, 0);
emittedStrings, config, 0);
if (cmSystemTools::GetErrorOccuredFlag())
{
return;
}
}
for(std::set<cmStdString>::const_iterator li = emittedBools.begin();
li != emittedBools.end(); ++li)
{
const std::set<cmStdString>::const_iterator si = emittedStrings.find(*li);
if (si != emittedStrings.end())
{
cmOStringStream e;
e << "Property \"" << *li << "\" appears in both the "
"COMPATIBLE_INTERFACE_BOOL and the COMPATIBLE_INTERFACE_STRING "
"property in the dependencies of target \"" << this->GetName() <<
"\". This is not allowed. A property may only require compatibility "
"in a boolean interpretation or a string interpretation, but not both.";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
break;
}
}
}
//----------------------------------------------------------------------------

1
Tests/RunCMake/CompatibleInterface/InterfaceString-Bool-Conflict-result.txt Normal file
View File

@ -0,0 +1 @@
1

5
Tests/RunCMake/CompatibleInterface/InterfaceString-Bool-Conflict-stderr.txt Normal file
View File

@ -0,0 +1,5 @@
CMake Error in CMakeLists.txt:
Property "SOMETHING" appears in both the COMPATIBLE_INTERFACE_BOOL and the
COMPATIBLE_INTERFACE_STRING property in the dependencies of target "user".
This is not allowed. A property may only require compatibility in a
boolean interpretation or a string interpretation, but not both.

9
Tests/RunCMake/CompatibleInterface/InterfaceString-Bool-Conflict.cmake Normal file
View File

@ -0,0 +1,9 @@
add_library(foo UNKNOWN IMPORTED)
add_library(bar UNKNOWN IMPORTED)
set_property(TARGET foo APPEND PROPERTY COMPATIBLE_INTERFACE_BOOL SOMETHING)
set_property(TARGET foo APPEND PROPERTY COMPATIBLE_INTERFACE_STRING SOMETHING)
add_executable(user main.cpp)
target_link_libraries(user foo bar)

1
Tests/RunCMake/CompatibleInterface/RunCMakeTest.cmake
View File

@ -8,3 +8,4 @@ run_cmake(InterfaceString-mismatch-depends)
run_cmake(InterfaceString-mismatch-depend-self)
run_cmake(InterfaceString-mismatched-use)
run_cmake(InterfaceString-builtin-prop)
run_cmake(InterfaceString-Bool-Conflict)