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

cmTarget: Fix reporting interface-set properties which are FALSE.

This commit is contained in:
Stephen Kelly 2013-12-30 11:13:04 +01:00
parent 07b0f54647
commit c67e1a6aac
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmTarget.cxx
View File

@ -4508,7 +4508,7 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
("INTERFACE_" + p).c_str(), 0); ("INTERFACE_" + p).c_str(), 0);
std::string reportEntry; std::string reportEntry;
if (ifacePropContent) if (ifaceIsSet)
{ {
reportEntry += " * Target \""; reportEntry += " * Target \"";
reportEntry += li->Target->GetName(); reportEntry += li->Target->GetName();

7
Tests/RunCMake/CompatibleInterface/DebugProperties-stderr.txt
View File

@ -24,6 +24,13 @@ CMake Debug Log:
\* Target "CompatibleInterface" property not set. \* Target "CompatibleInterface" property not set.
+ +
CMake Debug Log:
Boolean compatibility of property "BOOL_PROP5" for target
"CompatibleInterface" \(result: "FALSE"\):
\* Target "CompatibleInterface" property not set.
\* Target "iface1" property value "FALSE" \(Interface set\)
+
CMake Debug Log: CMake Debug Log:
String compatibility of property "STRING_PROP1" for target String compatibility of property "STRING_PROP1" for target
"CompatibleInterface" \(result: "prop1"\): "CompatibleInterface" \(result: "prop1"\):

4
Tests/RunCMake/CompatibleInterface/DebugProperties.cmake
View File

@ -13,6 +13,7 @@ set_property(TARGET iface1 APPEND PROPERTY
BOOL_PROP2 BOOL_PROP2
BOOL_PROP3 BOOL_PROP3
BOOL_PROP4 BOOL_PROP4
BOOL_PROP5
) )
set_property(TARGET iface1 APPEND PROPERTY set_property(TARGET iface1 APPEND PROPERTY
COMPATIBLE_INTERFACE_STRING COMPATIBLE_INTERFACE_STRING
@ -32,7 +33,7 @@ set_property(TARGET iface1 APPEND PROPERTY
) )
set(CMAKE_DEBUG_TARGET_PROPERTIES set(CMAKE_DEBUG_TARGET_PROPERTIES
BOOL_PROP1 BOOL_PROP2 BOOL_PROP3 BOOL_PROP4 BOOL_PROP1 BOOL_PROP2 BOOL_PROP3 BOOL_PROP4 BOOL_PROP5
STRING_PROP1 STRING_PROP2 STRING_PROP3 STRING_PROP1 STRING_PROP2 STRING_PROP3
NUMBER_MIN_PROP1 NUMBER_MIN_PROP2 NUMBER_MIN_PROP1 NUMBER_MIN_PROP2
NUMBER_MAX_PROP1 NUMBER_MAX_PROP2 NUMBER_MAX_PROP1 NUMBER_MAX_PROP2
@ -40,6 +41,7 @@ set(CMAKE_DEBUG_TARGET_PROPERTIES
set_property(TARGET iface1 PROPERTY INTERFACE_BOOL_PROP1 ON) set_property(TARGET iface1 PROPERTY INTERFACE_BOOL_PROP1 ON)
set_property(TARGET iface1 PROPERTY INTERFACE_BOOL_PROP2 ON) set_property(TARGET iface1 PROPERTY INTERFACE_BOOL_PROP2 ON)
set_property(TARGET iface1 PROPERTY INTERFACE_BOOL_PROP5 OFF)
set_property(TARGET iface1 PROPERTY INTERFACE_STRING_PROP1 prop1) set_property(TARGET iface1 PROPERTY INTERFACE_STRING_PROP1 prop1)
set_property(TARGET iface1 PROPERTY INTERFACE_STRING_PROP2 prop2) set_property(TARGET iface1 PROPERTY INTERFACE_STRING_PROP2 prop2)
set_property(TARGET iface1 PROPERTY INTERFACE_NUMBER_MIN_PROP1 100) set_property(TARGET iface1 PROPERTY INTERFACE_NUMBER_MIN_PROP1 100)