This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 84d9e6d72183560c036523e7fda33afb2acb3de8 (commit)
via ee18a74fc6e0046ce1c15b5bce0a628cace1be55 (commit)
via 640d3e4d3bc8546d0b78dd746506dc78d93d78dc (commit)
via 8abfe8909c878d6552304603b1d50808e002498b (commit)
via 90e98fc42b682b7a16fa765c7f9151a915e89501 (commit)
from a42d4495ef5deb15f409f3b8fcc411c790fdb8a6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=84d9e6d72183560c036523e7fda33afb2acb3de8
commit 84d9e6d72183560c036523e7fda33afb2acb3de8
Merge: a42d449 ee18a74
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Nov 20 18:40:48 2013 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Nov 20 18:40:48 2013 -0500
Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next
ee18a74 QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property.
640d3e4 QtAutoUic: Handle new -include command line parameter.
8abfe89 Genex: Add LOWER_CASE and MAKE_C_IDENTIFIER string manipulators.
90e98fc Help: Reformat the generator expression documentation.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee18a74fc6e0046ce1c15b5bce0a628cace1be55
commit ee18a74fc6e0046ce1c15b5bce0a628cace1be55
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Nov 20 14:54:39 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 21 00:38:41 2013 +0100
QtAutoUic: Add INTERFACE_AUTOUIC_OPTIONS target property.
Transitively consume the property from linked dependents.
Implement configuration-specific support by following the pattern
set out for compile definitions and includes in cmQtAutoGenerators.
Implement support for origin-tracking with CMAKE_DEBUG_TARGET_PROPERTIES.
This is motivated by the needs of KDE, which provides a separate
translation system based on gettext instead of the Qt linguist
translation system. The Qt uic tool provides command line options
for configuring the method used to translate text, and to add an
include directive to the generated file to provide the method.
http://thread.gmane.org/gmane.comp.kde.devel.frameworks/7930/focus=7992
Implement the interface to provide the uic options as a usage-requirement
on the KI18n target, as designed for KDE.
diff --git a/Help/manual/cmake-properties.7.rst
b/Help/manual/cmake-properties.7.rst
index e3a4cf8..7caf73d 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -141,6 +141,7 @@ Properties on Targets
/prop_tgt/INSTALL_NAME_DIR
/prop_tgt/INSTALL_RPATH
/prop_tgt/INSTALL_RPATH_USE_LINK_PATH
+ /prop_tgt/INTERFACE_AUTOUIC_OPTIONS
/prop_tgt/INTERFACE_COMPILE_DEFINITIONS
/prop_tgt/INTERFACE_COMPILE_OPTIONS
/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES
diff --git a/Help/prop_tgt/AUTOUIC_OPTIONS.rst
b/Help/prop_tgt/AUTOUIC_OPTIONS.rst
index c6cf885..aeec38b 100644
--- a/Help/prop_tgt/AUTOUIC_OPTIONS.rst
+++ b/Help/prop_tgt/AUTOUIC_OPTIONS.rst
@@ -15,3 +15,7 @@ This property is initialized by the value of the variable
The options set on the target may be overridden by :prop_sf:`AUTOUIC_OPTIONS`
set
on the .ui source file.
+
+This property may use "generator expressions" with the syntax "$<...>".
+See the :manual:`cmake-generator-expressions(7)` manual for available
+expressions.
diff --git a/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
b/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
new file mode 100644
index 0000000..1f63f00
--- /dev/null
+++ b/Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
@@ -0,0 +1,12 @@
+INTERFACE_AUTOUIC_OPTIONS
+-------------------------
+
+List of interface options to pass to uic.
+
+Targets may populate this property to publish the options
+required to use when invoking uic. Consuming targets can add entries to their
+own :prop_tgt:`AUTOUIC_OPTIONS` property such as
$<TARGET_PROPERTY:foo,INTERFACE_AUTOUIC_OPTIONS>
+to use the uic options specified in the interface of ``foo``.
+
+This property supports generator expressions. See the
+:manual:`cmake-generator-expressions(7)` manual for available expressions.
diff --git a/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
b/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
index 2ded823..6b17f6e 100644
--- a/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
+++ b/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
@@ -6,6 +6,6 @@ Enables tracing output for target properties.
This variable can be populated with a list of properties to generate
debug output for when evaluating target properties. Currently it can
only be used when evaluating the INCLUDE_DIRECTORIES,
-COMPILE_DEFINITIONS and COMPILE_OPTIONS target properties. In that
-case, it outputs a backtrace for each entry in the target property.
+COMPILE_DEFINITIONS, COMPILE_OPTIONS and AUTOUIC_OPTIONS target properties.
+In that case, it outputs a backtrace for each entry in the target property.
Default is unset.
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx
b/Source/cmGeneratorExpressionDAGChecker.cxx
index cfcaa70..76fd3ae 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -218,3 +218,11 @@ bool
cmGeneratorExpressionDAGChecker::EvaluatingCompileFeatures() const
return (strcmp(prop, "COMPILE_FEATURES") == 0
|| strcmp(prop, "INTERFACE_COMPILE_FEATURES") == 0);
}
+
+//----------------------------------------------------------------------------
+bool cmGeneratorExpressionDAGChecker::EvaluatingAutoUicOptions() const
+{
+ const char *prop = this->Property.c_str();
+ return (strcmp(prop, "AUTOUIC_OPTIONS") == 0
+ || strcmp(prop, "INTERFACE_AUTOUIC_OPTIONS") == 0 );
+}
diff --git a/Source/cmGeneratorExpressionDAGChecker.h
b/Source/cmGeneratorExpressionDAGChecker.h
index 0502430..eb2529e 100644
--- a/Source/cmGeneratorExpressionDAGChecker.h
+++ b/Source/cmGeneratorExpressionDAGChecker.h
@@ -21,14 +21,16 @@
F(EvaluatingSystemIncludeDirectories) \
F(EvaluatingCompileDefinitions) \
F(EvaluatingCompileOptions) \
- F(EvaluatingCompileFeatures)
+ F(EvaluatingCompileFeatures) \
+ F(EvaluatingAutoUicOptions)
#define CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(F) \
F(INCLUDE_DIRECTORIES) \
F(SYSTEM_INCLUDE_DIRECTORIES) \
F(COMPILE_DEFINITIONS) \
F(COMPILE_OPTIONS) \
- F(COMPILE_FEATURES)
+ F(COMPILE_FEATURES) \
+ F(AUTOUIC_OPTIONS)
//----------------------------------------------------------------------------
struct cmGeneratorExpressionDAGChecker
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 437678a..2786860 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -360,6 +360,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget*
target)
std::map<std::string, std::string> configIncludes;
std::map<std::string, std::string> configDefines;
+ std::map<std::string, std::string> configUicOptions;
if (target->GetPropertyAsBool("AUTOMOC"))
{
@@ -368,7 +369,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget*
target)
}
if (target->GetPropertyAsBool("AUTOUIC"))
{
- this->SetupAutoUicTarget(target);
+ this->SetupAutoUicTarget(target, configUicOptions);
}
if (target->GetPropertyAsBool("AUTORCC"))
{
@@ -383,7 +384,9 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget*
target)
makefile->ConfigureFile(inputFile.c_str(), outputFile.c_str(),
false, true, false);
- if (!configDefines.empty() || !configIncludes.empty())
+ if (!configDefines.empty()
+ || !configIncludes.empty()
+ || !configUicOptions.empty())
{
std::ofstream infoFile(outputFile.c_str(), std::ios::app);
if ( !infoFile )
@@ -414,6 +417,16 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget*
target)
" " << it->second << ")\n";
}
}
+ if (!configUicOptions.empty())
+ {
+ for (std::map<std::string, std::string>::iterator
+ it = configUicOptions.begin(), end = configUicOptions.end();
+ it != end; ++it)
+ {
+ infoFile << "set(AM_UIC_TARGET_OPTIONS_" << it->first <<
+ " " << it->second << ")\n";
+ }
+ }
}
}
@@ -596,7 +609,25 @@ void
cmQtAutoGenerators::MergeUicOptions(std::vector<std::string> &opts,
opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
}
-void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget* target)
+static void GetUicOpts(cmTarget *target, const char * config,
+ std::string &optString)
+{
+ std::vector<std::string> opts;
+ target->GetAutoUicOptions(opts, config);
+
+ const char* sep = "";
+ for(std::vector<std::string>::const_iterator optIt = opts.begin();
+ optIt != opts.end();
+ ++optIt)
+ {
+ optString += sep;
+ sep = ";";
+ optString += *optIt;
+ }
+}
+
+void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget* target,
+ std::map<std::string, std::string> &configUicOptions)
{
cmMakefile *makefile = target->GetMakefile();
@@ -645,10 +676,30 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget*
target)
const char *qtVersion = makefile->GetDefinition("_target_qt_version");
- if (const char* opts = target->GetProperty("AUTOUIC_OPTIONS"))
+ std::string _uic_opts;
+ std::vector<std::string> configs;
+ const char *config = makefile->GetConfigurations(configs);
+ GetUicOpts(target, config, _uic_opts);
+
+ if (!_uic_opts.empty())
+ {
+ _uic_opts = cmLocalGenerator::EscapeForCMake(_uic_opts.c_str());
+ makefile->AddDefinition("_uic_target_options", _uic_opts.c_str());
+ }
+ for (std::vector<std::string>::const_iterator li = configs.begin();
+ li != configs.end(); ++li)
{
- makefile->AddDefinition("_uic_target_options",
- cmLocalGenerator::EscapeForCMake(opts).c_str());
+ std::string config_uic_opts;
+ GetUicOpts(target, li->c_str(), config_uic_opts);
+ if (config_uic_opts != _uic_opts)
+ {
+ configUicOptions["_uic_target_options_" + *li] =
+ cmLocalGenerator::EscapeForCMake(config_uic_opts.c_str());
+ if(_uic_opts.empty())
+ {
+ _uic_opts = config_uic_opts;
+ }
+ }
}
for(std::vector<cmSourceFile*>::const_iterator fileIt =
@@ -967,9 +1018,19 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile*
makefile,
{
const char *uicOptionsFiles
= makefile->GetSafeDefinition("AM_UIC_OPTIONS_FILES");
+ std::string uicOptionsPropOrig = "AM_UIC_TARGET_OPTIONS";
+ std::string uicOptionsProp = uicOptionsPropOrig;
+ if(config)
+ {
+ uicOptionsProp += "_";
+ uicOptionsProp += config;
+ }
const char *uicTargetOptions
- = makefile->GetSafeDefinition("AM_UIC_TARGET_OPTIONS");
- cmSystemTools::ExpandListArgument(uicTargetOptions, this->UicTargetOptions);
+ = makefile->GetSafeDefinition(uicOptionsProp.c_str());
+ cmSystemTools::ExpandListArgument(
+ uicTargetOptions ? uicTargetOptions
+ : makefile->GetSafeDefinition(includesPropOrig.c_str()),
+ this->UicTargetOptions);
const char *uicOptionsOptions
= makefile->GetSafeDefinition("AM_UIC_OPTIONS_OPTIONS");
std::vector<std::string> uicFilesVec;
diff --git a/Source/cmQtAutoGenerators.h b/Source/cmQtAutoGenerators.h
index 116f174..e877f7d 100644
--- a/Source/cmQtAutoGenerators.h
+++ b/Source/cmQtAutoGenerators.h
@@ -31,7 +31,8 @@ private:
const std::string &autogenTargetName,
std::map<std::string, std::string> &configIncludes,
std::map<std::string, std::string> &configDefines);
- void SetupAutoUicTarget(cmTarget* target);
+ void SetupAutoUicTarget(cmTarget* target,
+ std::map<std::string, std::string> &configUicOptions);
void SetupAutoRccTarget(cmTarget* target);
cmGlobalGenerator* CreateGlobalGenerator(cmake* cm,
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 6008840..55828c6 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -136,6 +136,7 @@ public:
std::vector<TargetPropertyEntry*> IncludeDirectoriesEntries;
std::vector<TargetPropertyEntry*> CompileOptionsEntries;
std::vector<TargetPropertyEntry*> CompileFeaturesEntries;
+ std::vector<TargetPropertyEntry*> AutoUicOptionsEntries;
std::vector<TargetPropertyEntry*> CompileDefinitionsEntries;
std::vector<cmValueWithOrigin> LinkInterfacePropertyEntries;
@@ -144,6 +145,8 @@ public:
mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceCompileOptionsEntries;
mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
+ CachedLinkInterfaceAutoUicOptionsEntries;
+ mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceCompileDefinitionsEntries;
mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceCompileFeaturesEntries;
@@ -152,6 +155,7 @@ public:
mutable std::map<std::string, bool> CacheLinkInterfaceCompileDefinitionsDone;
mutable std::map<std::string, bool> CacheLinkInterfaceCompileOptionsDone;
mutable std::map<std::string, bool> CacheLinkInterfaceCompileFeaturesDone;
+ mutable std::map<std::string, bool> CacheLinkInterfaceAutoUicOptionsDone;
};
//----------------------------------------------------------------------------
@@ -187,6 +191,7 @@ cmTargetInternals::~cmTargetInternals()
deleteAndClear(this->CachedLinkInterfaceIncludeDirectoriesEntries);
deleteAndClear(this->CachedLinkInterfaceCompileOptionsEntries);
deleteAndClear(this->CachedLinkInterfaceCompileFeaturesEntries);
+ deleteAndClear(this->CachedLinkInterfaceAutoUicOptionsEntries);
deleteAndClear(this->CachedLinkInterfaceCompileDefinitionsEntries);
}
@@ -1423,6 +1428,17 @@ void cmTarget::SetProperty(const char* prop, const char*
value)
new cmTargetInternals::TargetPropertyEntry(cge));
return;
}
+ if(strcmp(prop,"AUTOUIC_OPTIONS") == 0)
+ {
+ cmListFileBacktrace lfbt;
+ this->Makefile->GetBacktrace(lfbt);
+ cmGeneratorExpression ge(lfbt);
+ deleteAndClear(this->Internal->AutoUicOptionsEntries);
+ cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
+ this->Internal->AutoUicOptionsEntries.push_back(
+ new cmTargetInternals::TargetPropertyEntry(cge));
+ return;
+ }
if(strcmp(prop,"COMPILE_DEFINITIONS") == 0)
{
cmListFileBacktrace lfbt;
@@ -1497,6 +1513,15 @@ void cmTarget::AppendProperty(const char* prop, const
char* value,
new cmTargetInternals::TargetPropertyEntry(ge.Parse(value)));
return;
}
+ if(strcmp(prop,"AUTOUIC_OPTIONS") == 0)
+ {
+ cmListFileBacktrace lfbt;
+ this->Makefile->GetBacktrace(lfbt);
+ cmGeneratorExpression ge(lfbt);
+ this->Internal->AutoUicOptionsEntries.push_back(
+ new cmTargetInternals::TargetPropertyEntry(ge.Parse(value)));
+ return;
+ }
if(strcmp(prop,"COMPILE_DEFINITIONS") == 0)
{
cmListFileBacktrace lfbt;
@@ -1993,6 +2018,106 @@ static void processCompileOptions(cmTarget const* tgt,
}
//----------------------------------------------------------------------------
+void cmTarget::GetAutoUicOptions(std::vector<std::string> &result,
+ const char *config) const
+{
+ std::set<std::string> uniqueOptions;
+ cmListFileBacktrace lfbt;
+
+ cmGeneratorExpressionDAGChecker dagChecker(lfbt,
+ this->GetName(),
+ "AUTOUIC_OPTIONS", 0, 0);
+
+ std::vector<std::string> debugProperties;
+ const char *debugProp =
+ this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
+ if (debugProp)
+ {
+ cmSystemTools::ExpandListArgument(debugProp, debugProperties);
+ }
+
+ bool debugOptions = !this->DebugCompileOptionsDone
+ && std::find(debugProperties.begin(),
+ debugProperties.end(),
+ "AUTOUIC_OPTIONS")
+ != debugProperties.end();
+
+ if (this->Makefile->IsGeneratingBuildSystem())
+ {
+ this->DebugAutoUicOptionsDone = true;
+ }
+
+ processCompileOptions(this,
+ this->Internal->AutoUicOptionsEntries,
+ result,
+ uniqueOptions,
+ &dagChecker,
+ config,
+ debugOptions);
+
+ std::string configString = config ? config : "";
+ if (!this->Internal->CacheLinkInterfaceAutoUicOptionsDone[configString])
+ {
+ for (std::vector<cmValueWithOrigin>::const_iterator
+ it = this->Internal->LinkInterfacePropertyEntries.begin(),
+ end = this->Internal->LinkInterfacePropertyEntries.end();
+ it != end; ++it)
+ {
+ if (!cmGeneratorExpression::IsValidTargetName(it->Value)
+ && cmGeneratorExpression::Find(it->Value) == std::string::npos)
+ {
+ continue;
+ }
+ {
+ cmGeneratorExpression ge(lfbt);
+ cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
+ ge.Parse(it->Value);
+ std::string targetResult = cge->Evaluate(this->Makefile, config,
+ false, this, 0, 0);
+ if (!this->Makefile->FindTargetToUse(targetResult.c_str()))
+ {
+ continue;
+ }
+ }
+ std::string optionGenex = "$<TARGET_PROPERTY:" +
+ it->Value + ",INTERFACE_AUTOUIC_OPTIONS>";
+ if (cmGeneratorExpression::Find(it->Value) != std::string::npos)
+ {
+ // Because it->Value is a generator expression, ensure that it
+ // evaluates to the non-empty string before being used in the
+ // TARGET_PROPERTY expression.
+ optionGenex = "$<$<BOOL:" + it->Value + ">:" + optionGenex + ">";
+ }
+ cmGeneratorExpression ge(it->Backtrace);
+ cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(
+ optionGenex);
+
+ this->Internal
+ ->CachedLinkInterfaceAutoUicOptionsEntries[configString].push_back(
+ new cmTargetInternals::TargetPropertyEntry(cge,
+ it->Value));
+ }
+ }
+
+ processCompileOptions(this,
+ this->Internal->CachedLinkInterfaceAutoUicOptionsEntries[configString],
+ result,
+ uniqueOptions,
+ &dagChecker,
+ config,
+ debugOptions);
+
+ if (!this->Makefile->IsGeneratingBuildSystem())
+ {
+ deleteAndClear(this->Internal->CachedLinkInterfaceAutoUicOptionsEntries);
+ }
+ else
+ {
+ this->Internal->CacheLinkInterfaceAutoUicOptionsDone[configString] = true;
+ }
+}
+
+//----------------------------------------------------------------------------
void cmTarget::GetCompileOptions(std::vector<std::string> &result,
const char *config) const
{
@@ -2822,6 +2947,24 @@ const char *cmTarget::GetProperty(const char* prop,
}
return output.c_str();
}
+ if(strcmp(prop,"AUTOUIC_OPTIONS") == 0)
+ {
+ static std::string output;
+ output = "";
+ std::string sep;
+ typedef cmTargetInternals::TargetPropertyEntry
+ TargetPropertyEntry;
+ for (std::vector<TargetPropertyEntry*>::const_iterator
+ it = this->Internal->AutoUicOptionsEntries.begin(),
+ end = this->Internal->AutoUicOptionsEntries.end();
+ it != end; ++it)
+ {
+ output += sep;
+ output += (*it)->ge->GetInput();
+ sep = ";";
+ }
+ return output.c_str();
+ }
if(strcmp(prop,"COMPILE_DEFINITIONS") == 0)
{
static std::string output;
@@ -6025,6 +6168,7 @@ cmTargetInternalPointer::~cmTargetInternalPointer()
deleteAndClear(this->Pointer->IncludeDirectoriesEntries);
deleteAndClear(this->Pointer->CompileOptionsEntries);
deleteAndClear(this->Pointer->CompileFeaturesEntries);
+ deleteAndClear(this->Pointer->AutoUicOptionsEntries);
deleteAndClear(this->Pointer->CompileDefinitionsEntries);
delete this->Pointer;
}
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 0dc90a4..1dd3620 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -526,6 +526,8 @@ public:
const char *config) const;
void GetCompileFeatures(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,
@@ -683,6 +685,7 @@ private:
bool IsImportedTarget;
mutable bool DebugIncludesDone;
mutable bool DebugCompileOptionsDone;
+ mutable bool DebugAutoUicOptionsDone;
mutable bool DebugCompileDefinitionsDone;
mutable bool DebugCompileFeaturesDone;
mutable std::set<std::string> LinkImplicitNullProperties;
diff --git a/Tests/QtAutoUicInterface/CMakeLists.txt
b/Tests/QtAutoUicInterface/CMakeLists.txt
new file mode 100644
index 0000000..155cb67
--- /dev/null
+++ b/Tests/QtAutoUicInterface/CMakeLists.txt
@@ -0,0 +1,50 @@
+
+cmake_minimum_required(VERSION 2.8.12)
+
+project(QtAutoUicInterface)
+
+find_package(Qt5Widgets 5.3 REQUIRED)
+
+set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+
+# BEGIN Upstream
+
+add_library(KI18n klocalizedstring.cpp)
+target_link_libraries(KI18n Qt5::Core)
+
+set(autouic_options
+ -include klocalizedstring.h
+ -tr tr2$<$<NOT:$<BOOL:$<TARGET_PROPERTY:NO_KUIT_SEMANTIC>>>:x>i18n
+)
+set_property(TARGET KI18n APPEND PROPERTY
+ INTERFACE_AUTOUIC_OPTIONS ${autouic_options}
+)
+
+set(domainProp $<TARGET_PROPERTY:TRANSLATION_DOMAIN>)
+set(nameLower $<LOWER_CASE:$<MAKE_C_IDENTIFIER:$<TARGET_PROPERTY:NAME>>>)
+set(domain_logic
+
$<$<BOOL:${domainProp}>:${domainProp}>$<$<NOT:$<BOOL:${domainProp}>>:${nameLower}>
+)
+set_property(TARGET KI18n APPEND PROPERTY
+ INTERFACE_COMPILE_DEFINITIONS "TRANSLATION_DOMAIN=${domain_logic}"
+)
+
+# END upstream
+
+add_library(LibWidget libwidget.cpp)
+target_link_libraries(LibWidget KI18n Qt5::Widgets)
+set_property(TARGET LibWidget PROPERTY NO_KUIT_SEMANTIC ON)
+set_property(TARGET LibWidget PROPERTY TRANSLATION_DOMAIN customdomain)
+
+add_library(MyWidget mywidget.cpp)
+target_link_libraries(MyWidget KI18n Qt5::Widgets)
+
+add_executable(QtAutoUicInterface main.cpp)
+target_compile_definitions(QtAutoUicInterface
+ PRIVATE
+ UI_LIBWIDGET_H="${CMAKE_CURRENT_BINARY_DIR}/ui_libwidget.h"
+ UI_MYWIDGET_H="${CMAKE_CURRENT_BINARY_DIR}/ui_mywidget.h"
+)
diff --git a/Tests/QtAutoUicInterface/klocalizedstring.cpp
b/Tests/QtAutoUicInterface/klocalizedstring.cpp
new file mode 100644
index 0000000..b1c4523
--- /dev/null
+++ b/Tests/QtAutoUicInterface/klocalizedstring.cpp
@@ -0,0 +1,12 @@
+
+#include "klocalizedstring.h"
+
+QString tr2xi18n(const char *text, const char *)
+{
+ return QStringLiteral("TranslatedX") + QString::fromLatin1(text);
+}
+
+QString tr2i18n(const char *text, const char *)
+{
+ return QStringLiteral("Translated") + QString::fromLatin1(text);
+}
diff --git a/Tests/QtAutoUicInterface/klocalizedstring.h
b/Tests/QtAutoUicInterface/klocalizedstring.h
new file mode 100644
index 0000000..559058f
--- /dev/null
+++ b/Tests/QtAutoUicInterface/klocalizedstring.h
@@ -0,0 +1,17 @@
+
+#ifndef KLOCALIZEDSTRING_H
+#define KLOCALIZEDSTRING_H
+
+#include <QString>
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+QString tr2xi18n(const char *text, const char *comment = 0);
+
+#ifdef _WIN32
+__declspec(dllexport)
+#endif
+QString tr2i18n(const char *text, const char *comment = 0);
+
+#endif
diff --git a/Tests/QtAutoUicInterface/libwidget.cpp
b/Tests/QtAutoUicInterface/libwidget.cpp
new file mode 100644
index 0000000..8a921b3
--- /dev/null
+++ b/Tests/QtAutoUicInterface/libwidget.cpp
@@ -0,0 +1,9 @@
+
+#include "libwidget.h"
+
+LibWidget::LibWidget(QWidget *parent)
+ : QWidget(parent),
+ ui(new Ui::LibWidget)
+{
+ ui->setupUi(this);
+}
diff --git a/Tests/QtAutoUicInterface/libwidget.h
b/Tests/QtAutoUicInterface/libwidget.h
new file mode 100644
index 0000000..96ffda3
--- /dev/null
+++ b/Tests/QtAutoUicInterface/libwidget.h
@@ -0,0 +1,19 @@
+
+#ifndef LIBWIDGET_H
+#define LIBWIDGET_H
+
+#include <QWidget>
+
+#include "ui_libwidget.h"
+
+class LibWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ explicit LibWidget(QWidget *parent = 0);
+
+private:
+ QScopedPointer<Ui::LibWidget> ui;
+};
+
+#endif
diff --git a/Tests/QtAutoUicInterface/libwidget.ui
b/Tests/QtAutoUicInterface/libwidget.ui
new file mode 100644
index 0000000..897371e
--- /dev/null
+++ b/Tests/QtAutoUicInterface/libwidget.ui
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LibWidget</class>
+ <widget class="QWidget" name="LibWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <widget class="QLabel" name="label">
+ <property name="geometry">
+ <rect>
+ <x>180</x>
+ <y>60</y>
+ <width>57</width>
+ <height>15</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>LibLabel</string>
+ </property>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Tests/QtAutoUicInterface/main.cpp
b/Tests/QtAutoUicInterface/main.cpp
new file mode 100644
index 0000000..bf11f90
--- /dev/null
+++ b/Tests/QtAutoUicInterface/main.cpp
@@ -0,0 +1,73 @@
+
+#include <fstream>
+#include <iostream>
+#include <string>
+
+int main(int argc, char **argv)
+{
+ std::ifstream f;
+ f.open(UI_LIBWIDGET_H);
+ if (!f.is_open())
+ {
+ return -1;
+ }
+
+ {
+ bool gotTr2i18n = false;
+
+ while (!f.eof())
+ {
+ std::string output;
+ getline(f, output);
+ if (!gotTr2i18n)
+ {
+ gotTr2i18n = output.find("tr2i18n") != std::string::npos;
+ }
+ if (output.find("tr2xi18n") != std::string::npos)
+ {
+ std::cout << "ui_libwidget,h uses tr2xi18n, though it should not." <<
std::endl;
+ return -1;
+ }
+ }
+
+ if (!gotTr2i18n)
+ {
+ std::cout << "Did not find tr2i18n in ui_libwidget.h" << std::endl;
+ return -1;
+ }
+ }
+
+ f.close();
+ f.open(UI_MYWIDGET_H);
+ if (!f.is_open())
+ {
+ return -1;
+ }
+
+ {
+ bool gotTr2xi18n = false;
+
+ while (!f.eof())
+ {
+ std::string output;
+ getline(f, output);
+ if (!gotTr2xi18n)
+ {
+ gotTr2xi18n = output.find("tr2xi18n") != std::string::npos;
+ }
+ if (output.find("tr2i18n") != std::string::npos)
+ {
+ std::cout << "ui_mywidget,h uses tr2i18n, though it should not." <<
std::endl;
+ return -1;
+ }
+ }
+ if (!gotTr2xi18n)
+ {
+ std::cout << "Did not find tr2xi18n in ui_mywidget.h" << std::endl;
+ return -1;
+ }
+ }
+ f.close();
+
+ return 0;
+}
diff --git a/Tests/QtAutoUicInterface/mywidget.cpp
b/Tests/QtAutoUicInterface/mywidget.cpp
new file mode 100644
index 0000000..b528b1a
--- /dev/null
+++ b/Tests/QtAutoUicInterface/mywidget.cpp
@@ -0,0 +1,9 @@
+
+#include "mywidget.h"
+
+MyWidget::MyWidget(QWidget *parent)
+ : QWidget(parent),
+ ui(new Ui::MyWidget)
+{
+ ui->setupUi(this);
+}
diff --git a/Tests/QtAutoUicInterface/mywidget.h
b/Tests/QtAutoUicInterface/mywidget.h
new file mode 100644
index 0000000..4f31a39
--- /dev/null
+++ b/Tests/QtAutoUicInterface/mywidget.h
@@ -0,0 +1,19 @@
+
+#ifndef MYWIDGET_H
+#define MYWIDGET_H
+
+#include <QWidget>
+
+#include "ui_mywidget.h"
+
+class MyWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ explicit MyWidget(QWidget *parent = 0);
+
+private:
+ QScopedPointer<Ui::MyWidget> ui;
+};
+
+#endif
diff --git a/Tests/QtAutoUicInterface/mywidget.ui
b/Tests/QtAutoUicInterface/mywidget.ui
new file mode 100644
index 0000000..b2b9cc5
--- /dev/null
+++ b/Tests/QtAutoUicInterface/mywidget.ui
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MyWidget</class>
+ <widget class="QWidget" name="MyWidget">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Form</string>
+ </property>
+ <widget class="QPushButton" name="pushButton">
+ <property name="geometry">
+ <rect>
+ <x>110</x>
+ <y>40</y>
+ <width>81</width>
+ <height>23</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>Special button</string>
+ </property>
+ </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=640d3e4d3bc8546d0b78dd746506dc78d93d78dc
commit 640d3e4d3bc8546d0b78dd746506dc78d93d78dc
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Nov 20 23:17:13 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 21 00:31:37 2013 +0100
QtAutoUic: Handle new -include command line parameter.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 36cb368..437678a 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -560,6 +560,7 @@ void
cmQtAutoGenerators::MergeUicOptions(std::vector<std::string> &opts,
"translate",
"postfix",
"generator",
+ "include", // Since Qt 5.3
"g"
};
std::vector<std::string> extraOpts;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8abfe8909c878d6552304603b1d50808e002498b
commit 8abfe8909c878d6552304603b1d50808e002498b
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Nov 20 21:40:29 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 21 00:31:36 2013 +0100
Genex: Add LOWER_CASE and MAKE_C_IDENTIFIER string manipulators.
diff --git a/Help/manual/cmake-generator-expressions.7.rst
b/Help/manual/cmake-generator-expressions.7.rst
index c7d2ed2..886f073 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -177,3 +177,7 @@ $<BUILD_INTERFACE:...>
Content of ``...`` when the property is exported using :command:`export`, or
when the target is used by another target in the same buildsystem. Expands to
the empty string otherwise.
+$<LOWER_CASE:...>
+ Content of ``...`` converted to lower case.
+$<MAKE_C_IDENTIFIER:...>
+ Content of ``...`` converted to a C identifier.
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 2ae5a22..6a4ed37 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -199,6 +199,34 @@ static const struct StrEqualNode : public
cmGeneratorExpressionNode
} strEqualNode;
//----------------------------------------------------------------------------
+static const struct LowerCaseNode : public cmGeneratorExpressionNode
+{
+ LowerCaseNode() {}
+
+ std::string Evaluate(const std::vector<std::string> ¶meters,
+ cmGeneratorExpressionContext *,
+ const GeneratorExpressionContent *,
+ cmGeneratorExpressionDAGChecker *) const
+ {
+ return cmSystemTools::LowerCase(parameters.front());
+ }
+} lowerCaseNode;
+
+//----------------------------------------------------------------------------
+static const struct MakeCIdentifierNode : public cmGeneratorExpressionNode
+{
+ MakeCIdentifierNode() {}
+
+ std::string Evaluate(const std::vector<std::string> ¶meters,
+ cmGeneratorExpressionContext *,
+ const GeneratorExpressionContent *,
+ cmGeneratorExpressionDAGChecker *) const
+ {
+ return cmSystemTools::MakeCidentifier(parameters.front().c_str());
+ }
+} makeCIdentifierNode;
+
+//----------------------------------------------------------------------------
static const struct Angle_RNode : public cmGeneratorExpressionNode
{
Angle_RNode() {}
@@ -1441,6 +1469,10 @@ cmGeneratorExpressionNode* GetNode(const std::string
&identifier)
return &targetSoNameFileDirNode;
else if (identifier == "STREQUAL")
return &strEqualNode;
+ else if (identifier == "LOWER_CASE")
+ return &lowerCaseNode;
+ else if (identifier == "MAKE_C_IDENTIFIER")
+ return &makeCIdentifierNode;
else if (identifier == "BOOL")
return &boolNode;
else if (identifier == "ANGLE-R")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=90e98fc42b682b7a16fa765c7f9151a915e89501
commit 90e98fc42b682b7a16fa765c7f9151a915e89501
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Nov 20 22:01:41 2013 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 21 00:31:36 2013 +0100
Help: Reformat the generator expression documentation.
Use description lists instead of a preformatted block to enumerate
the genex documentation.
Consistently capitalize the description.
Use ``...`` to format genex parameters in the description.
Turn references to commands into links.
Add high level documentation about the motivation for generator
expressions.
Regroup expressions into subsections for different genex types. Add
a high-level description and example of the expressions in each
section.
Explode the documentation for filesystem artifacts, instead of only
referring to the variations.
diff --git a/Help/manual/cmake-generator-expressions.7.rst
b/Help/manual/cmake-generator-expressions.7.rst
index ddde183..c7d2ed2 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -10,77 +10,170 @@ cmake-generator-expressions(7)
Generator Expressions
=====================
-Generator expressions are evaluated during build
-system generation to produce information specific to each build
-configuration. Valid expressions are:
-
-::
-
- $<0:...> = empty string (ignores "...")
- $<1:...> = content of "..."
- $<CONFIG:cfg> = '1' if config is "cfg", else '0'
- $<CONFIGURATION> = configuration name
- $<BOOL:...> = '1' if the '...' is true, else '0'
- $<STREQUAL:a,b> = '1' if a is STREQUAL b, else '0'
- $<ANGLE-R> = A literal '>'. Used to compare strings which
contain a '>' for example.
- $<COMMA> = A literal ','. Used to compare strings which
contain a ',' for example.
- $<SEMICOLON> = A literal ';'. Used to prevent list expansion on
an argument with ';'.
- $<JOIN:list,...> = joins the list with the content of "..."
- $<TARGET_NAME:...> = Marks ... as being the name of a target. This
is required if exporting targets to multiple dependent export sets. The '...'
must be a literal name of a target- it may not contain generator expressions.
- $<INSTALL_INTERFACE:...> = content of "..." when the property is exported
using install(EXPORT), and empty otherwise.
- $<BUILD_INTERFACE:...> = content of "..." when the property is exported
using export(), or when the target is used by another target in the same
buildsystem. Expands to the empty string otherwise.
- $<PLATFORM_ID> = The CMake-id of the platform
$<PLATFORM_ID:comp> = '1' if the The CMake-id of the platform matches
comp, otherwise '0'.
- $<C_COMPILER_ID> = The CMake-id of the C compiler used.
- $<C_COMPILER_ID:comp> = '1' if the CMake-id of the C compiler matches
comp, otherwise '0'.
- $<CXX_COMPILER_ID> = The CMake-id of the CXX compiler used.
- $<CXX_COMPILER_ID:comp> = '1' if the CMake-id of the CXX compiler matches
comp, otherwise '0'.
- $<VERSION_GREATER:v1,v2> = '1' if v1 is a version greater than v2, else '0'.
- $<VERSION_LESS:v1,v2> = '1' if v1 is a version less than v2, else '0'.
- $<VERSION_EQUAL:v1,v2> = '1' if v1 is the same version as v2, else '0'.
- $<C_COMPILER_VERSION> = The version of the C compiler used.
- $<C_COMPILER_VERSION:ver> = '1' if the version of the C compiler matches
ver, otherwise '0'.
- $<CXX_COMPILER_VERSION> = The version of the CXX compiler used.
- $<CXX_COMPILER_VERSION:ver> = '1' if the version of the CXX compiler matches
ver, otherwise '0'.
- $<TARGET_FILE:tgt> = main file (.exe, .so.1.2, .a)
- $<TARGET_LINKER_FILE:tgt> = file used to link (.a, .lib, .so)
- $<TARGET_SONAME_FILE:tgt> = file with soname (.so.3)
-
-where "tgt" is the name of a target. Target file expressions produce
-a full path, but _DIR and _NAME versions can produce the directory and
-file name components:
-
-::
-
- $<TARGET_FILE_DIR:tgt>/$<TARGET_FILE_NAME:tgt>
- $<TARGET_LINKER_FILE_DIR:tgt>/$<TARGET_LINKER_FILE_NAME:tgt>
- $<TARGET_SONAME_FILE_DIR:tgt>/$<TARGET_SONAME_FILE_NAME:tgt>
-
-
-
-::
-
- $<TARGET_PROPERTY:tgt,prop> = The value of the property prop on the target
tgt.
-
-Note that tgt is not added as a dependency of the target this
-expression is evaluated on.
-
-::
-
- $<TARGET_POLICY:pol> = '1' if the policy was NEW when the 'head'
target was created, else '0'. If the policy was not set, the warning message
for the policy will be emitted. This generator expression only works for a
subset of policies.
- $<INSTALL_PREFIX> = Content of the install prefix when the target is
exported via INSTALL(EXPORT) and empty otherwise.
-
-Boolean expressions:
-
-::
-
- $<AND:?[,?]...> = '1' if all '?' are '1', else '0'
- $<OR:?[,?]...> = '0' if all '?' are '0', else '1'
- $<NOT:?> = '0' if '?' is '1', else '1'
-
-where '?' is always either '0' or '1'.
-
-Expressions with an implicit 'this' target:
-
-::
-
- $<TARGET_PROPERTY:prop> = The value of the property prop on the target on
which the generator expression is evaluated.
+Generator expressions are evaluated during build system generation to produce
+information specific to each build configuration.
+
+Generator expressions are allowed in the context of many target properties,
+such as :prop_tgt:`LINK_LIBRARIES`, :prop_tgt:`INCLUDE_DIRECTORIES`,
+:prop_tgt:`COMPILE_DEFINITIONS` and others. They may also be used when using
+commands to populate those properties, such as
:command:`target_link_libraries`,
+:command:`target_include_directories`, :command:`target_compile_definitions`
+and others.
+
+This means that they enable conditional linking, conditional
+definitions used when compiling, and conditional include directories and
+more. The conditions may be based on the build configuration, target
+properties, platform information or any other queryable information.
+
+Logical expressions
+-------------------
+
+Logical expressions are used to create conditional output. The basic
+expressions are the ``0`` and ``1`` expressions. Because other logical
+expressions evaluate to either ``0`` or ``1``, they can be composed to
+create conditional output::
+
+ $<$<CONFIG:Debug>:DEBUG_MODE>
+
+expands to ``DEBUG_MODE`` when the ``Debug`` configuration is used, and
+otherwise expands to nothing.
+
+$<0:...>
+ Empty string (ignores ``...``)
+$<1:...>
+ Content of ``...``
+$<BOOL:...>
+ '1' if the ``...`` is true, else '0'
+$<AND:?[,?]...>
+ '1' if all ``?`` are '1', else '0'
+
+ The ``?`` must always be either '0' or '1' in boolean expressions.
+
+$<OR:?[,?]...>
+ '0' if all ``?`` are '0', else '1'
+$<NOT:?>
+ '0' if ``?`` is '1', else '1'
+$<STREQUAL:a,b>
+ '1' if ``a`` is STREQUAL ``b``, else '0'
+$<CONFIG:cfg>
+ '1' if config is ``cfg``, else '0'. This is a case-insensitive comparison.
+ The mapping in :prop_tgt:`MAP_IMPORTED_CONFIG_<CONFIG>` is also considered by
+ this expression when it is evaluated on a property on an :prop_tgt:`IMPORTED`
+ target.
+$<PLATFORM_ID:comp>
+ '1' if the CMake-id of the platform matches ``comp``, otherwise '0'.
+$<C_COMPILER_ID:comp>
+ '1' if the CMake-id of the C compiler matches ``comp``, otherwise '0'.
+$<CXX_COMPILER_ID:comp>
+ '1' if the CMake-id of the CXX compiler matches ``comp``, otherwise '0'.
+$<VERSION_GREATER:v1,v2>
+ '1' if ``v1`` is a version greater than ``v2``, else '0'.
+$<VERSION_LESS:v1,v2>
+ '1' if ``v1`` is a version less than ``v2``, else '0'.
+$<VERSION_EQUAL:v1,v2>
+ '1' if ``v1`` is the same version as ``v2``, else '0'.
+$<C_COMPILER_VERSION:ver>
+ '1' if the version of the C compiler matches ``ver``, otherwise '0'.
+$<CXX_COMPILER_VERSION:ver>
+ '1' if the version of the CXX compiler matches ``ver``, otherwise '0'.
+$<TARGET_POLICY:pol>
+ '1' if the policy ``pol`` was NEW when the 'head' target was created,
+ else '0'. If the policy was not set, the warning message for the policy
+ will be emitted. This generator expression only works for a subset of
+ policies.
+
+Informational expressions
+-------------------------
+
+These expressions expand to some information. The information may be used
+directly, eg::
+
+ include_directories(/usr/include/$<CXX_COMPILER_ID>/)
+
+expands to ``/usr/include/GNU/`` or ``/usr/include/Clang/`` etc, depending on
+the Id of the compiler.
+
+These expressions may also may be combined with logical expressions::
+
+ $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,4.2.0>:OLD_COMPILER>
+
+expands to ``OLD_COMPILER`` if the :variable:`CMAKE_<LANG>_COMPILER_VERSION` is
+less than 4.2.0.
+
+$<CONFIGURATION>
+ Configuration name
+$<PLATFORM_ID>
+ The CMake-id of the platform
+$<C_COMPILER_ID>
+ The CMake-id of the C compiler used.
+$<CXX_COMPILER_ID>
+ The CMake-id of the CXX compiler used.
+$<C_COMPILER_VERSION>
+ The version of the C compiler used.
+$<CXX_COMPILER_VERSION>
+ The version of the CXX compiler used.
+$<TARGET_FILE:tgt>
+ Full path to main file (.exe, .so.1.2, .a) where ``tgt`` is the name of a
target.
+$<TARGET_FILE_NAME:tgt>
+ Name of main file (.exe, .so.1.2, .a).
+$<TARGET_FILE_DIR:tgt>
+ Directory of main file (.exe, .so.1.2, .a).
+$<TARGET_LINKER_FILE:tgt>
+ File used to link (.a, .lib, .so) where ``tgt`` is the name of a target.
+$<TARGET_LINKER_FILE_NAME:tgt>
+ Name of file used to link (.a, .lib, .so).
+$<TARGET_LINKER_FILE_DIR:tgt>
+ Directory of file used to link (.a, .lib, .so).
+$<TARGET_SONAME_FILE:tgt>
+ File with soname (.so.3) where ``tgt`` is the name of a target.
+$<TARGET_SONAME_FILE_NAME:tgt>
+ Name of file with soname (.so.3).
+$<TARGET_SONAME_FILE_DIR:tgt>
+ Directory of with soname (.so.3).
+$<TARGET_PROPERTY:tgt,prop>
+ Value of the property ``prop`` on the target ``tgt``.
+
+ Note that ``tgt`` is not added as a dependency of the target this
+ expression is evaluated on.
+$<TARGET_PROPERTY:prop>
+ Value of the property ``prop`` on the target on which the generator
+ expression is evaluated.
+$<INSTALL_PREFIX>
+ Content of the install prefix when the target is exported via
+ :command:`install` (EXPORT) and empty otherwise.
+
+Output expressions
+------------------
+
+These expressions generate output, in some cases depending on an input. These
+expressions may be combined with other expressions for information or logical
+comparison::
+
+ -I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>, -I>
+
+generates a string of the entries in the :prop_tgt:`INCLUDE_DIRECTORIES` target
+property with each entry preceeded by ``-I``. Note that a more-complete use
+in this situation would be require first checking if the INCLUDE_DIRECTORIES
+property is non-empty::
+
+
$<$<BOOL:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>>:-I$<JOIN:$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>,
-I>>
+
+$<JOIN:list,...>
+ Joins the list with the content of ``...``
+$<ANGLE-R>
+ A literal '>'. Used to compare strings which contain a '>' for example.
+$<COMMA>
+ A literal ','. Used to compare strings which contain a ',' for example.
+$<SEMICOLON>
+ A literal ';'. Used to prevent list expansion on an argument with ';'.
+$<TARGET_NAME:...>
+ Marks ``...`` as being the name of a target. This is required if exporting
+ targets to multiple dependent export sets. The ``...`` must be a literal
+ name of a target- it may not contain generator expressions.
+$<INSTALL_INTERFACE:...>
+ Content of ``...`` when the property is exported using :command:`install`
(EXPORT),
+ and empty otherwise.
+$<BUILD_INTERFACE:...>
+ Content of ``...`` when the property is exported using :command:`export`, or
+ when the target is used by another target in the same buildsystem. Expands to
+ the empty string otherwise.
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-generator-expressions.7.rst | 245 ++++++++++++++++-------
Help/manual/cmake-properties.7.rst | 1 +
Help/prop_tgt/AUTOUIC_OPTIONS.rst | 4 +
Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst | 12 +
Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst | 4 +-
Source/cmGeneratorExpressionDAGChecker.cxx | 8 +
Source/cmGeneratorExpressionDAGChecker.h | 6 +-
Source/cmGeneratorExpressionEvaluator.cxx | 32 +++
Source/cmQtAutoGenerators.cxx | 78 +++++++-
Source/cmQtAutoGenerators.h | 3 +-
Source/cmTarget.cxx | 144 +++++++++++++
Source/cmTarget.h | 3 +
Tests/QtAutoUicInterface/CMakeLists.txt | 50 +++++
Tests/QtAutoUicInterface/klocalizedstring.cpp | 12 +
Tests/QtAutoUicInterface/klocalizedstring.h | 17 ++
Tests/QtAutoUicInterface/libwidget.cpp | 9 +
Tests/QtAutoUicInterface/libwidget.h | 19 ++
Tests/QtAutoUicInterface/libwidget.ui | 32 +++
Tests/QtAutoUicInterface/main.cpp | 73 +++++++
Tests/QtAutoUicInterface/mywidget.cpp | 9 +
Tests/QtAutoUicInterface/mywidget.h | 19 ++
Tests/QtAutoUicInterface/mywidget.ui | 32 +++
22 files changed, 725 insertions(+), 87 deletions(-)
create mode 100644 Help/prop_tgt/INTERFACE_AUTOUIC_OPTIONS.rst
create mode 100644 Tests/QtAutoUicInterface/CMakeLists.txt
create mode 100644 Tests/QtAutoUicInterface/klocalizedstring.cpp
create mode 100644 Tests/QtAutoUicInterface/klocalizedstring.h
create mode 100644 Tests/QtAutoUicInterface/libwidget.cpp
create mode 100644 Tests/QtAutoUicInterface/libwidget.h
create mode 100644 Tests/QtAutoUicInterface/libwidget.ui
create mode 100644 Tests/QtAutoUicInterface/main.cpp
create mode 100644 Tests/QtAutoUicInterface/mywidget.cpp
create mode 100644 Tests/QtAutoUicInterface/mywidget.h
create mode 100644 Tests/QtAutoUicInterface/mywidget.ui
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
