Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Brad King
CMake
Commits
fbe1fa72
Commit
fbe1fa72
authored
Dec 30, 2013
by
Stephen Kelly
Browse files
cmTarget: Don't repeat property origin debug information.
parent
01c545c5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Source/cmTarget.cxx
View file @
fbe1fa72
...
...
@@ -4580,12 +4580,6 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget const* tgt,
{
propContent
=
impliedValue
<
PropertyType
>
(
propContent
);
reportEntry
+=
" * Target
\"
"
;
reportEntry
+=
li
->
Target
->
GetName
();
reportEntry
+=
"
\"
property value
\"
"
;
reportEntry
+=
valueAsString
<
PropertyType
>
(
propContent
);
reportEntry
+=
"
\"
"
;
if
(
ifaceIsSet
)
{
std
::
pair
<
bool
,
PropertyType
>
consistent
=
...
...
Tests/RunCMake/CompatibleInterface/DebugProperties-stderr.txt
View file @
fbe1fa72
...
...
@@ -39,6 +39,13 @@ CMake Debug Log:
\* Target "iface1" property value "FALSE" \(Interface set\)
\* Target "iface2" property value "FALSE" \(Agree\)
+
CMake Debug Log:
Boolean compatibility of property "BOOL_PROP7" for target
"CompatibleInterface" \(result: "FALSE"\):
\* Target "CompatibleInterface" property is implied by use.
\* Target "iface1" property value "FALSE" \(Agree\)
+
CMake Debug Log:
String compatibility of property "STRING_PROP1" for target
"CompatibleInterface" \(result: "prop1"\):
...
...
Tests/RunCMake/CompatibleInterface/DebugProperties.cmake
View file @
fbe1fa72
...
...
@@ -15,6 +15,7 @@ set_property(TARGET iface1 APPEND PROPERTY
BOOL_PROP4
BOOL_PROP5
BOOL_PROP6
BOOL_PROP7
)
set_property
(
TARGET iface1 APPEND PROPERTY
COMPATIBLE_INTERFACE_STRING
...
...
@@ -34,7 +35,7 @@ set_property(TARGET iface1 APPEND PROPERTY
)
set
(
CMAKE_DEBUG_TARGET_PROPERTIES
BOOL_PROP1 BOOL_PROP2 BOOL_PROP3 BOOL_PROP4 BOOL_PROP5 BOOL_PROP6
BOOL_PROP1 BOOL_PROP2 BOOL_PROP3 BOOL_PROP4 BOOL_PROP5 BOOL_PROP6
BOOL_PROP7
STRING_PROP1 STRING_PROP2 STRING_PROP3
NUMBER_MIN_PROP1 NUMBER_MIN_PROP2
NUMBER_MAX_PROP1 NUMBER_MAX_PROP2
...
...
@@ -44,6 +45,7 @@ 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_PROP5 OFF
)
set_property
(
TARGET iface1 PROPERTY INTERFACE_BOOL_PROP6 OFF
)
set_property
(
TARGET iface1 PROPERTY INTERFACE_BOOL_PROP7 OFF
)
set_property
(
TARGET iface1 PROPERTY INTERFACE_STRING_PROP1 prop1
)
set_property
(
TARGET iface1 PROPERTY INTERFACE_STRING_PROP2 prop2
)
set_property
(
TARGET iface1 PROPERTY INTERFACE_NUMBER_MIN_PROP1 100
)
...
...
@@ -54,8 +56,12 @@ set_property(TARGET iface1 PROPERTY INTERFACE_NUMBER_MAX_PROP2 200)
add_library
(
iface2 INTERFACE
)
set_property
(
TARGET iface2 PROPERTY INTERFACE_BOOL_PROP6 OFF
)
add_library
(
iface3 INTERFACE
)
add_executable
(
CompatibleInterface empty.cpp
)
target_link_libraries
(
CompatibleInterface iface1 iface2
)
target_link_libraries
(
CompatibleInterface iface1 iface2
$<$<BOOL:$<TARGET_PROPERTY:BOOL_PROP7>>:iface3>
)
set_property
(
TARGET CompatibleInterface PROPERTY BOOL_PROP2 ON
)
set_property
(
TARGET CompatibleInterface PROPERTY BOOL_PROP3 ON
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment