summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-02 17:07:31 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-02 17:07:31 (GMT)
commitea8d1a9ccab1020642cb71a158f104c2d2e953a4 (patch)
treea926b5b223acd54f6a054d4fd0912c0caf235276 /Source/cmTarget.h
parented1de30da06a22bc6d9cfd147a99f7728f175802 (diff)
parent98093c45db3327dc92879670ef22dc4001392480 (diff)
downloadCMake-ea8d1a9ccab1020642cb71a158f104c2d2e953a4.zip
CMake-ea8d1a9ccab1020642cb71a158f104c2d2e953a4.tar.gz
CMake-ea8d1a9ccab1020642cb71a158f104c2d2e953a4.tar.bz2
Merge topic 'INTERFACE_AUTOUIC_OPTIONS'
98093c4 QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property. 02542b4 QtAutoUic: Handle new -include command line parameter. 1242f4e Genex: Add {UPPER,LOWER}_CASE and MAKE_C_IDENTIFIER. 754b321 QtAutogen: Use config without prefix in map key.
Diffstat (limited to 'Source/cmTarget.h')
-rw-r--r--Source/cmTarget.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 7a40d70..93e8b99 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -533,6 +533,8 @@ public:
void GetCompileOptions(std::vector<std::string> &result,
const char *config) const;
+ void GetAutoUicOptions(std::vector<std::string> &result,
+ const char *config) const;
bool IsNullImpliedByLinkLibraries(const std::string &p) const;
bool IsLinkInterfaceDependentBoolProperty(const std::string &p,
@@ -690,6 +692,7 @@ private:
bool IsImportedTarget;
mutable bool DebugIncludesDone;
mutable bool DebugCompileOptionsDone;
+ mutable bool DebugAutoUicOptionsDone;
mutable bool DebugCompileDefinitionsDone;
mutable std::set<std::string> LinkImplicitNullProperties;
bool BuildInterfaceIncludesAppended;