diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-12-03 12:26:51 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-12-08 06:03:29 (GMT) |
| commit | 77f3772784152701ff0eee5e4a19177996c03c0e (patch) | |
| tree | c20abe0601fc037887e11b7c2ef6f20c21596801 /Source/cmTarget.h | |
| parent | 2e60b5fcf7929232c2e731f21e1ab9a889949fa3 (diff) | |
| download | CMake-77f3772784152701ff0eee5e4a19177996c03c0e.zip CMake-77f3772784152701ff0eee5e4a19177996c03c0e.tar.gz CMake-77f3772784152701ff0eee5e4a19177996c03c0e.tar.bz2 | |
cmTarget: Require a compatible INTERFACE_AUTOUIC_OPTIONS from dependencies.
Revert the origin-tracking infrastructure from commit 98093c45 (QtAutoUic:
Add INTERFACE_AUTOUIC_OPTIONS target property., 2013-11-20). Use the
compatibility-tracking for compatible strings instead.
If two different dependencies require different AUTOUIC_OPTIONS,
cmake will now appropriately issue an error.
Diffstat (limited to 'Source/cmTarget.h')
| -rw-r--r-- | Source/cmTarget.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h index 2f4be84..3f5a5d1 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -698,7 +698,6 @@ private: mutable bool DebugIncludesDone; mutable std::map<std::string, bool> DebugCompatiblePropertiesDone; mutable bool DebugCompileOptionsDone; - mutable bool DebugAutoUicOptionsDone; mutable bool DebugCompileDefinitionsDone; mutable std::set<std::string> LinkImplicitNullProperties; bool BuildInterfaceIncludesAppended; |