[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1576-g593e4b5
Stephen Kelly
steveire at gmail.com
Sat Mar 29 14:00:59 EDT 2014
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 593e4b566b5b58a08f0be61798a94171c2156e31 (commit)
via 5d1c5d6c995afcd2bf288e32dc2e1c4b9f608ebb (commit)
from 8594ef5c73a648ddb53d7589b70048a8bdc1a4ab (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=593e4b566b5b58a08f0be61798a94171c2156e31
commit 593e4b566b5b58a08f0be61798a94171c2156e31
Merge: 8594ef5 5d1c5d6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 29 14:00:58 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 29 14:00:58 2014 -0400
Merge topic 'target-transitive-sources' into next
5d1c5d6c Revert partially
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d1c5d6c995afcd2bf288e32dc2e1c4b9f608ebb
commit 5d1c5d6c995afcd2bf288e32dc2e1c4b9f608ebb
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 29 18:58:52 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 29 19:00:13 2014 +0100
Revert partially
diff --git a/Help/command/target_sources.rst b/Help/command/target_sources.rst
deleted file mode 100644
index ff756b4..0000000
--- a/Help/command/target_sources.rst
+++ /dev/null
@@ -1,28 +0,0 @@
-target_sources
---------------
-
-Add sources to a target.
-
-::
-
- target_sources(<target>
- <INTERFACE|PUBLIC|PRIVATE> [items1...]
- [<INTERFACE|PUBLIC|PRIVATE> [items2...] ...])
-
-Specify sources to use when compiling a given target. The
-named ``<target>`` must have been created by a command such as
-:command:`add_executable` or :command:`add_library` and must not be an
-:prop_tgt:`IMPORTED Target`.
-
-The ``INTERFACE``, ``PUBLIC`` and ``PRIVATE`` keywords are required to
-specify the scope of the following arguments. ``PRIVATE`` and ``PUBLIC``
-items will populate the :prop_tgt:`SOURCES` property of
-``<target>``. ``PUBLIC`` and ``INTERFACE`` items will populate the
-:prop_tgt:`INTERFACE_SOURCES` property of ``<target>``. The
-following arguments specify sources. Repeated calls for the same
-``<target>`` append items in the order called.
-
-Arguments to ``target_sources`` may use "generator expressions"
-with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
-manual for available expressions. See the :manual:`cmake-buildsystem(7)`
-manual for more on defining buildsystem properties.
diff --git a/Help/manual/cmake-commands.7.rst b/Help/manual/cmake-commands.7.rst
index 4b1dbed..fb0d2b5 100644
--- a/Help/manual/cmake-commands.7.rst
+++ b/Help/manual/cmake-commands.7.rst
@@ -94,7 +94,6 @@ These commands may be used freely in CMake projects.
/command/target_compile_options
/command/target_include_directories
/command/target_link_libraries
- /command/target_sources
/command/try_compile
/command/try_run
/command/unset
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index fd16eb9..6ea5839 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -152,7 +152,6 @@ Properties on Targets
/prop_tgt/INTERFACE_INCLUDE_DIRECTORIES
/prop_tgt/INTERFACE_LINK_LIBRARIES
/prop_tgt/INTERFACE_POSITION_INDEPENDENT_CODE
- /prop_tgt/INTERFACE_SOURCES
/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG
/prop_tgt/INTERPROCEDURAL_OPTIMIZATION
diff --git a/Help/prop_tgt/INTERFACE_SOURCES.rst b/Help/prop_tgt/INTERFACE_SOURCES.rst
deleted file mode 100644
index fb28231..0000000
--- a/Help/prop_tgt/INTERFACE_SOURCES.rst
+++ /dev/null
@@ -1,15 +0,0 @@
-INTERFACE_SOURCES
------------------
-
-List of interface sources to pass to the compiler.
-
-Targets may populate this property to publish the sources
-for consuming targets to compile. Consuming
-targets can add entries to their own :prop_tgt:`SOURCES` property
-such as ``$<TARGET_PROPERTY:foo,INTERFACE_SOURCES>`` to use the
-sources specified in the interface of ``foo``.
-
-Contents of ``INTERFACE_SOURCES`` may use "generator expressions"
-with the syntax ``$<...>``. See the :manual:`cmake-generator-expressions(7)`
-manual for available expressions. See the :manual:`cmake-buildsystem(7)`
-manual for more on defining buildsystem properties.
diff --git a/Help/prop_tgt/SOURCES.rst b/Help/prop_tgt/SOURCES.rst
index 493643e..833b65a 100644
--- a/Help/prop_tgt/SOURCES.rst
+++ b/Help/prop_tgt/SOURCES.rst
@@ -3,4 +3,5 @@ SOURCES
Source names specified for a target.
-List of sources specified for a target.
+Read-only list of sources specified for a target. The names returned
+are suitable for passing to the set_source_files_properties command.
diff --git a/Help/release/dev/target-INTERFACE_SOURCES.rst b/Help/release/dev/target-INTERFACE_SOURCES.rst
deleted file mode 100644
index 4e34943..0000000
--- a/Help/release/dev/target-INTERFACE_SOURCES.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-target-INTERFACE_SOURCES
-------------------------
-
-* A new :prop_tgt:`INTERFACE_SOURCES` target property was introduced. This is
- consumed by dependent targets, which compile and link the listed sources.
diff --git a/Help/release/dev/target-SOURCES-write.rst b/Help/release/dev/target-SOURCES-write.rst
deleted file mode 100644
index a754a73..0000000
--- a/Help/release/dev/target-SOURCES-write.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-target-SOURCES-write.rst
-------------------------
-
-* It is now possible to write and append to the :prop_tgt:`SOURCES` target
- property. The :variable:`CMAKE_DEBUG_TARGET_PROPERTIES` variable may be
- used to trace the origin of sources.
diff --git a/Help/release/dev/target_sources-command.rst b/Help/release/dev/target_sources-command.rst
deleted file mode 100644
index abfb303..0000000
--- a/Help/release/dev/target_sources-command.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-target_sources-command
-----------------------
-
-* The :command:`target_sources` command was added to add to the
- :prop_tgt:`SOURCES` target property.
diff --git a/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst b/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
index edd8fa1..11aed0c 100644
--- a/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
+++ b/Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
@@ -6,8 +6,7 @@ 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 :prop_tgt:`INCLUDE_DIRECTORIES`,
-:prop_tgt:`COMPILE_DEFINITIONS`, :prop_tgt:`COMPILE_OPTIONS`,
-:prop_tgt:`AUTOUIC_OPTIONS`, :prop_tgt:`SOURCES`,
+:prop_tgt:`COMPILE_DEFINITIONS`, :prop_tgt:`COMPILE_OPTIONS`, :prop_tgt:`AUTOUIC_OPTIONS`,
:prop_tgt:`POSITION_INDEPENDENT_CODE` target properties and any other property
listed in :prop_tgt:`COMPATIBLE_INTERFACE_STRING` and other ``COMPATIBLE_INTERFACE_``
properties. It outputs an origin for each entry in the target property.
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 4c678d8..27d099d 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -348,7 +348,6 @@ foreach(command_file
cmTargetCompileDefinitionsCommand
cmTargetCompileOptionsCommand
cmTargetIncludeDirectoriesCommand
- cmTargetSourcesCommand
cmUseMangledMesaCommand
cmUtilitySourceCommand
cmVariableRequiresCommand
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx
index 7f8e694..07efba9 100644
--- a/Source/cmGeneratorExpressionDAGChecker.cxx
+++ b/Source/cmGeneratorExpressionDAGChecker.cxx
@@ -179,18 +179,6 @@ bool cmGeneratorExpressionDAGChecker::EvaluatingLinkLibraries(const char *tgt)
|| strcmp(prop, "INTERFACE_LINK_LIBRARIES") == 0;
}
-std::string cmGeneratorExpressionDAGChecker::TopTarget() const
-{
- const cmGeneratorExpressionDAGChecker *top = this;
- const cmGeneratorExpressionDAGChecker *parent = this->Parent;
- while (parent)
- {
- top = parent;
- parent = parent->Parent;
- }
- return top->Target;
-}
-
enum TransitiveProperty {
#define DEFINE_ENUM_ENTRY(NAME) NAME,
CM_FOR_EACH_TRANSITIVE_PROPERTY_NAME(DEFINE_ENUM_ENTRY)
diff --git a/Source/cmGeneratorExpressionDAGChecker.h b/Source/cmGeneratorExpressionDAGChecker.h
index b3147f7..6cbbd2a 100644
--- a/Source/cmGeneratorExpressionDAGChecker.h
+++ b/Source/cmGeneratorExpressionDAGChecker.h
@@ -25,8 +25,7 @@
SELECT(F, EvaluatingSystemIncludeDirectories, SYSTEM_INCLUDE_DIRECTORIES) \
SELECT(F, EvaluatingCompileDefinitions, COMPILE_DEFINITIONS) \
SELECT(F, EvaluatingCompileOptions, COMPILE_OPTIONS) \
- SELECT(F, EvaluatingAutoUicOptions, AUTOUIC_OPTIONS) \
- SELECT(F, EvaluatingSources, SOURCES)
+ SELECT(F, EvaluatingAutoUicOptions, AUTOUIC_OPTIONS)
#define CM_FOR_EACH_TRANSITIVE_PROPERTY(F) \
CM_FOR_EACH_TRANSITIVE_PROPERTY_IMPL(F, CM_SELECT_BOTH)
@@ -71,8 +70,6 @@ struct cmGeneratorExpressionDAGChecker
void SetTransitivePropertiesOnly()
{ this->TransitivePropertiesOnly = true; }
- std::string TopTarget() const;
-
private:
Result CheckGraph() const;
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index 59e3aec..a392675 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -985,8 +985,7 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
if (propertyName == "LINKER_LANGUAGE")
{
if (target->LinkLanguagePropagatesToDependents() &&
- dagCheckerParent && (dagCheckerParent->EvaluatingLinkLibraries()
- || dagCheckerParent->EvaluatingSources()))
+ dagCheckerParent && dagCheckerParent->EvaluatingLinkLibraries())
{
reportError(context, content->GetOriginalExpression(),
"LINKER_LANGUAGE target property can not be used while evaluating "
@@ -1570,9 +1569,7 @@ struct TargetFilesystemArtifact : public cmGeneratorExpressionNode
"Target \"" + name + "\" is not an executable or library.");
return std::string();
}
- if (dagChecker && (dagChecker->EvaluatingLinkLibraries(name.c_str())
- || (dagChecker->EvaluatingSources()
- && name == dagChecker->TopTarget())))
+ if (dagChecker && dagChecker->EvaluatingLinkLibraries(name.c_str()))
{
::reportError(context, content->GetOriginalExpression(),
"Expressions which require the linker language may not "
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index dfd5796..fbd7315 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -159,13 +159,10 @@ public:
CachedLinkInterfaceCompileOptionsEntries;
mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
CachedLinkInterfaceCompileDefinitionsEntries;
- mutable std::map<std::string, std::vector<TargetPropertyEntry*> >
- CachedLinkInterfaceSourcesEntries;
mutable std::map<std::string, bool> CacheLinkInterfaceIncludeDirectoriesDone;
mutable std::map<std::string, bool> CacheLinkInterfaceCompileDefinitionsDone;
mutable std::map<std::string, bool> CacheLinkInterfaceCompileOptionsDone;
- mutable std::map<std::string, bool> CacheLinkInterfaceSourcesDone;
};
//----------------------------------------------------------------------------
@@ -201,7 +198,6 @@ cmTargetInternals::~cmTargetInternals()
deleteAndClear(this->CachedLinkInterfaceIncludeDirectoriesEntries);
deleteAndClear(this->CachedLinkInterfaceCompileOptionsEntries);
deleteAndClear(this->CachedLinkInterfaceCompileDefinitionsEntries);
- deleteAndClear(this->CachedLinkInterfaceSourcesEntries);
}
//----------------------------------------------------------------------------
@@ -224,7 +220,6 @@ cmTarget::cmTarget()
this->DebugIncludesDone = false;
this->DebugCompileOptionsDone = false;
this->DebugCompileDefinitionsDone = false;
- this->DebugSourcesDone = false;
}
//----------------------------------------------------------------------------
@@ -548,186 +543,41 @@ bool cmTarget::IsBundleOnApple() const
}
//----------------------------------------------------------------------------
-static void processSources(cmTarget const* tgt,
- const std::vector<cmTargetInternals::TargetPropertyEntry*> &entries,
- std::vector<std::string> &srcs,
- std::set<std::string> &uniqueSrcs,
- cmGeneratorExpressionDAGChecker *dagChecker,
- cmTarget const* head,
- std::string const& config, bool debugSources)
-{
- cmMakefile *mf = tgt->GetMakefile();
-
- for (std::vector<cmTargetInternals::TargetPropertyEntry*>::const_iterator
- it = entries.begin(), end = entries.end(); it != end; ++it)
- {
- bool cacheSources = false;
- std::vector<std::string> entrySources = (*it)->CachedEntries;
- if(entrySources.empty())
- {
- cmSystemTools::ExpandListArgument((*it)->ge->Evaluate(mf,
- config,
- false,
- head ? head : tgt,
- tgt,
- dagChecker),
- entrySources);
- if (mf->IsGeneratingBuildSystem()
- && !(*it)->ge->GetHadContextSensitiveCondition())
- {
- cacheSources = true;
- }
-
- for(std::vector<std::string>::const_iterator i = entrySources.begin();
- i != entrySources.end(); ++i)
- {
- std::string src = *i;
-
- cmSourceFile* sf = mf->GetOrCreateSource(src);
- std::string e;
- if(sf->GetFullPath(&e).empty())
- {
- if(!e.empty())
- {
- cmake* cm = mf->GetCMakeInstance();
- cm->IssueMessage(cmake::FATAL_ERROR, e,
- tgt->GetBacktrace());
- }
- return;
- }
- }
- if (cacheSources)
- {
- (*it)->CachedEntries = entrySources;
- }
- }
- std::string usedSources;
- for(std::vector<std::string>::iterator
- li = entrySources.begin(); li != entrySources.end(); ++li)
- {
- std::string src = *li;
-
- if(uniqueSrcs.insert(src).second)
- {
- srcs.push_back(src);
- if (debugSources)
- {
- usedSources += " * " + src + "\n";
- }
- }
- }
- if (!usedSources.empty())
- {
- mf->GetCMakeInstance()->IssueMessage(cmake::LOG,
- std::string("Used sources for target ")
- + tgt->GetName() + ":\n"
- + usedSources, (*it)->ge->GetBacktrace());
- }
- }
-}
-
-//----------------------------------------------------------------------------
void cmTarget::GetSourceFiles(std::vector<std::string> &files,
- const std::string& config,
- cmTarget const* head) const
+ const std::string& config) const
{
assert(this->GetType() != INTERFACE_LIBRARY);
-
- std::vector<std::string> debugProperties;
- const char *debugProp =
- this->Makefile->GetDefinition("CMAKE_DEBUG_TARGET_PROPERTIES");
- if (debugProp)
+ for(std::vector<cmTargetInternals::TargetPropertyEntry*>::const_iterator
+ si = this->Internal->SourceEntries.begin();
+ si != this->Internal->SourceEntries.end(); ++si)
{
- cmSystemTools::ExpandListArgument(debugProp, debugProperties);
- }
-
- bool debugSources = !this->DebugSourcesDone
- && std::find(debugProperties.begin(),
- debugProperties.end(),
- "SOURCES")
- != debugProperties.end();
-
- if (this->Makefile->IsGeneratingBuildSystem())
- {
- this->DebugSourcesDone = true;
- }
-
- cmListFileBacktrace lfbt;
-
- cmGeneratorExpressionDAGChecker dagChecker(lfbt,
- this->GetName(),
- "SOURCES", 0, 0);
-
- std::set<std::string> uniqueSrcs;
- processSources(this,
- this->Internal->SourceEntries,
- files,
- uniqueSrcs,
- &dagChecker,
- head,
- config,
- debugSources);
+ std::vector<std::string> srcs;
+ cmSystemTools::ExpandListArgument((*si)->ge->Evaluate(this->Makefile,
+ config,
+ false,
+ this),
+ srcs);
- if (!this->Internal->CacheLinkInterfaceSourcesDone[config])
- {
- for (std::vector<cmValueWithOrigin>::const_iterator
- it = this->Internal->LinkImplementationPropertyEntries.begin(),
- end = this->Internal->LinkImplementationPropertyEntries.end();
- it != end; ++it)
- {
- if (!cmGeneratorExpression::IsValidTargetName(it->Value)
- && cmGeneratorExpression::Find(it->Value) == std::string::npos)
- {
- continue;
- }
+ for(std::vector<std::string>::const_iterator i = srcs.begin();
+ i != srcs.end(); ++i)
{
- cmGeneratorExpression ge(lfbt);
- cmsys::auto_ptr<cmCompiledGeneratorExpression> cge =
- ge.Parse(it->Value);
- std::string targetResult = cge->Evaluate(this->Makefile, config,
- false, this, 0, &dagChecker);
- if (!this->Makefile->FindTargetToUse(targetResult))
- {
- continue;
- }
- }
- std::string sourceGenex = "$<TARGET_PROPERTY:" +
- it->Value + ",INTERFACE_SOURCES>";
- if (cmGeneratorExpression::Find(it->Value) != std::string::npos)
+ std::string src = *i;
+ cmSourceFile* sf = this->Makefile->GetOrCreateSource(src);
+ std::string e;
+ src = sf->GetFullPath(&e);
+ if(src.empty())
{
- // Because it->Value is a generator expression, ensure that it
- // evaluates to the non-empty string before being used in the
- // TARGET_PROPERTY expression.
- sourceGenex = "$<$<BOOL:" + it->Value + ">:" + sourceGenex + ">";
+ if(!e.empty())
+ {
+ cmake* cm = this->Makefile->GetCMakeInstance();
+ cm->IssueMessage(cmake::FATAL_ERROR, e,
+ this->GetBacktrace());
+ }
+ return;
}
- cmGeneratorExpression ge(it->Backtrace);
- cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(
- sourceGenex);
-
- this->Internal
- ->CachedLinkInterfaceSourcesEntries[config].push_back(
- new cmTargetInternals::TargetPropertyEntry(cge,
- it->Value));
+ files.push_back(src);
}
}
-
- processSources(this,
- this->Internal->CachedLinkInterfaceSourcesEntries[config],
- files,
- uniqueSrcs,
- &dagChecker,
- head,
- config,
- debugSources);
-
- if (!this->Makefile->IsGeneratingBuildSystem())
- {
- deleteAndClear(this->Internal->CachedLinkInterfaceSourcesEntries);
- }
- else
- {
- this->Internal->CacheLinkInterfaceSourcesDone[config] = true;
- }
}
//----------------------------------------------------------------------------
@@ -789,11 +639,10 @@ cmTarget::GetConfigCommonSourceFiles(std::vector<cmSourceFile*>& files) const
//----------------------------------------------------------------------------
void cmTarget::GetSourceFiles(std::vector<cmSourceFile*> &files,
- const std::string& config,
- cmTarget const* head) const
+ const std::string& config) const
{
std::vector<std::string> srcs;
- this->GetSourceFiles(srcs, config, head);
+ this->GetSourceFiles(srcs, config);
std::set<cmSourceFile*> emitted;
@@ -1696,25 +1545,6 @@ void cmTarget::SetProperty(const std::string& prop, const char* value)
this->Internal->LinkImplementationPropertyEntries.push_back(entry);
return;
}
- if (prop == "SOURCES")
- {
- if(this->IsImported())
- {
- cmOStringStream e;
- e << "SOURCES property can't be set on imported targets (\""
- << this->Name << "\")\n";
- this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
- return;
- }
- cmListFileBacktrace lfbt;
- this->Makefile->GetBacktrace(lfbt);
- cmGeneratorExpression ge(lfbt);
- this->Internal->SourceEntries.clear();
- cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
- this->Internal->SourceEntries.push_back(
- new cmTargetInternals::TargetPropertyEntry(cge));
- return;
- }
this->Properties.SetProperty(prop, value, cmProperty::TARGET);
this->MaybeInvalidatePropertyCache(prop);
}
@@ -1782,25 +1612,6 @@ void cmTarget::AppendProperty(const std::string& prop, const char* value,
this->Internal->LinkImplementationPropertyEntries.push_back(entry);
return;
}
- if (prop == "SOURCES")
- {
- if(this->IsImported())
- {
- cmOStringStream e;
- e << "SOURCES property can't be set on imported targets (\""
- << this->Name << "\")\n";
- this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
- return;
- }
-
- cmListFileBacktrace lfbt;
- this->Makefile->GetBacktrace(lfbt);
- cmGeneratorExpression ge(lfbt);
- cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(value);
- this->Internal->SourceEntries.push_back(
- new cmTargetInternals::TargetPropertyEntry(cge));
- return;
- }
this->Properties.AppendProperty(prop, value, cmProperty::TARGET, asString);
this->MaybeInvalidatePropertyCache(prop);
}
@@ -5242,11 +5053,10 @@ bool cmTarget::IsLinkInterfaceDependentNumberMaxProperty(const std::string &p,
//----------------------------------------------------------------------------
void cmTarget::GetLanguages(std::set<std::string>& languages,
- const std::string& config,
- cmTarget const* head) const
+ const std::string& config) const
{
std::vector<cmSourceFile*> sourceFiles;
- this->GetSourceFiles(sourceFiles, config, head);
+ this->GetSourceFiles(sourceFiles, config);
for(std::vector<cmSourceFile*>::const_iterator
i = sourceFiles.begin(); i != sourceFiles.end(); ++i)
{
@@ -5301,7 +5111,7 @@ void cmTarget::GetLanguages(std::set<std::string>& languages,
for(std::vector<cmTarget*>::const_iterator
i = objectLibraries.begin(); i != objectLibraries.end(); ++i)
{
- (*i)->GetLanguages(languages, config, head);
+ (*i)->GetLanguages(languages, config);
}
}
@@ -6240,7 +6050,7 @@ cmTarget::GetLinkImplementation(const std::string& config,
// Compute the link implementation for this configuration.
LinkImplementation impl;
this->ComputeLinkImplementation(config, impl, head);
- this->ComputeLinkImplementationLanguages(config, impl, head);
+ this->ComputeLinkImplementationLanguages(config, impl);
// Store the information for this configuration.
cmTargetInternals::LinkImplMapType::value_type entry(key, impl);
@@ -6248,7 +6058,7 @@ cmTarget::GetLinkImplementation(const std::string& config,
}
else if (i->second.Languages.empty())
{
- this->ComputeLinkImplementationLanguages(config, i->second, head);
+ this->ComputeLinkImplementationLanguages(config, i->second);
}
return &i->second;
@@ -6362,13 +6172,12 @@ void cmTarget::ComputeLinkImplementation(const std::string& config,
//----------------------------------------------------------------------------
void
cmTarget::ComputeLinkImplementationLanguages(const std::string& config,
- LinkImplementation& impl,
- cmTarget const* head) const
+ LinkImplementation& impl) const
{
// This target needs runtime libraries for its source languages.
std::set<std::string> languages;
// Get languages used in our source files.
- this->GetLanguages(languages, config, head);
+ this->GetLanguages(languages, config);
// Copy the set of langauges to the link implementation.
for(std::set<std::string>::iterator li = languages.begin();
li != languages.end(); ++li)
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 055e029..042b441 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -136,11 +136,9 @@ public:
* Get the list of the source files used by this target
*/
void GetSourceFiles(std::vector<std::string> &files,
- const std::string& config,
- cmTarget const* head = 0) const;
+ const std::string& config) const;
void GetSourceFiles(std::vector<cmSourceFile*> &files,
- const std::string& config,
- cmTarget const* head = 0) const;
+ const std::string& config) const;
bool GetConfigCommonSourceFiles(std::vector<cmSourceFile*>& files) const;
/**
@@ -471,8 +469,7 @@ public:
// information to forward these property changes to the targets
// until we have per-target object file properties.
void GetLanguages(std::set<std::string>& languages,
- std::string const& config,
- cmTarget const* head = 0) const;
+ const std::string& config) const;
/** Return whether this target is an executable with symbol exports
enabled. */
@@ -710,7 +707,6 @@ private:
mutable std::map<std::string, bool> DebugCompatiblePropertiesDone;
mutable bool DebugCompileOptionsDone;
mutable bool DebugCompileDefinitionsDone;
- mutable bool DebugSourcesDone;
mutable std::set<std::string> LinkImplicitNullProperties;
bool BuildInterfaceIncludesAppended;
@@ -747,8 +743,7 @@ private:
LinkImplementation& impl,
cmTarget const* head) const;
void ComputeLinkImplementationLanguages(const std::string& config,
- LinkImplementation& impl,
- cmTarget const* head) const;
+ LinkImplementation& impl) const;
void ComputeLinkClosure(const std::string& config, LinkClosure& lc,
cmTarget const* head) const;
diff --git a/Source/cmTargetSourcesCommand.cxx b/Source/cmTargetSourcesCommand.cxx
deleted file mode 100644
index e82b36d..0000000
--- a/Source/cmTargetSourcesCommand.cxx
+++ /dev/null
@@ -1,64 +0,0 @@
-/*============================================================================
- CMake - Cross Platform Makefile Generator
- Copyright 2014 Stephen Kelly <steveire at gmail.com>
-
- Distributed under the OSI-approved BSD License (the "License");
- see accompanying file Copyright.txt for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
-============================================================================*/
-#include "cmTargetSourcesCommand.h"
-
-#include "cmGeneratorExpression.h"
-
-//----------------------------------------------------------------------------
-bool cmTargetSourcesCommand
-::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &)
-{
- return this->HandleArguments(args, "SOURCES");
-}
-
-//----------------------------------------------------------------------------
-void cmTargetSourcesCommand
-::HandleImportedTarget(const std::string &tgt)
-{
- cmOStringStream e;
- e << "Cannot specify sources for imported target \""
- << tgt << "\".";
- this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
-}
-
-//----------------------------------------------------------------------------
-void cmTargetSourcesCommand
-::HandleMissingTarget(const std::string &name)
-{
- cmOStringStream e;
- e << "Cannot specify sources for target \"" << name << "\" "
- "which is not built by this project.";
- this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
-}
-
-//----------------------------------------------------------------------------
-std::string cmTargetSourcesCommand
-::Join(const std::vector<std::string> &content)
-{
- std::string srcs;
- std::string sep;
- for(std::vector<std::string>::const_iterator it = content.begin();
- it != content.end(); ++it)
- {
- srcs += sep + *it;
- sep = ";";
- }
- return srcs;
-}
-
-//----------------------------------------------------------------------------
-void cmTargetSourcesCommand
-::HandleDirectContent(cmTarget *tgt, const std::vector<std::string> &content,
- bool, bool)
-{
- tgt->AppendProperty("SOURCES", this->Join(content).c_str());
-}
diff --git a/Source/cmTargetSourcesCommand.h b/Source/cmTargetSourcesCommand.h
deleted file mode 100644
index dae78c4..0000000
--- a/Source/cmTargetSourcesCommand.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*============================================================================
- CMake - Cross Platform Makefile Generator
- Copyright 2014 Stephen Kelly <steveire at gmail.com>
-
- Distributed under the OSI-approved BSD License (the "License");
- see accompanying file Copyright.txt for details.
-
- This software is distributed WITHOUT ANY WARRANTY; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- See the License for more information.
-============================================================================*/
-
-#ifndef cmTargetSourcesCommand_h
-#define cmTargetSourcesCommand_h
-
-#include "cmTargetPropCommandBase.h"
-
-//----------------------------------------------------------------------------
-class cmTargetSourcesCommand : public cmTargetPropCommandBase
-{
-public:
- /**
- * This is a virtual constructor for the command.
- */
- virtual cmCommand* Clone()
- {
- return new cmTargetSourcesCommand;
- }
-
- /**
- * This is called when the command is first encountered in
- * the CMakeLists.txt file.
- */
- virtual bool InitialPass(std::vector<std::string> const& args,
- cmExecutionStatus &status);
-
- /**
- * The name of the command as specified in CMakeList.txt.
- */
- virtual std::string GetName() const { return "target_sources";}
-
- cmTypeMacro(cmTargetSourcesCommand, cmTargetPropCommandBase);
-
-private:
- virtual void HandleImportedTarget(const std::string &tgt);
- virtual void HandleMissingTarget(const std::string &name);
-
- virtual void HandleDirectContent(cmTarget *tgt,
- const std::vector<std::string> &content,
- bool prepend, bool system);
-
- virtual std::string Join(const std::vector<std::string> &content);
-};
-
-#endif
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1c474ab..e77133a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -282,7 +282,6 @@ if(BUILD_TESTING)
set(ConfigSources_BUILD_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
ADD_TEST_MACRO(ConfigSources ConfigSources)
endif()
- ADD_TEST_MACRO(SourcesProperty SourcesProperty)
set_tests_properties(EmptyLibrary PROPERTIES
PASS_REGULAR_EXPRESSION "CMake Error: CMake can not determine linker language for target: test")
ADD_TEST_MACRO(CrossCompile CrossCompile)
diff --git a/Tests/ConfigSources/CMakeLists.txt b/Tests/ConfigSources/CMakeLists.txt
index c272257..68a4233 100644
--- a/Tests/ConfigSources/CMakeLists.txt
+++ b/Tests/ConfigSources/CMakeLists.txt
@@ -3,15 +3,7 @@ cmake_minimum_required(VERSION 3.0)
project(ConfigSources)
-add_library(iface INTERFACE)
-set_property(TARGET iface PROPERTY INTERFACE_SOURCES
- iface_src.cpp
- $<$<CONFIG:Debug>:iface_debug_src.cpp>
- $<$<CONFIG:Release>:does_not_exist.cpp>
-)
-
add_executable(ConfigSources
$<$<CONFIG:Debug>:main.cpp>
$<$<CONFIG:Release>:does_not_exist.cpp>
)
-target_link_libraries(ConfigSources iface)
diff --git a/Tests/ConfigSources/iface_debug.h b/Tests/ConfigSources/iface_debug.h
deleted file mode 100644
index a23d737..0000000
--- a/Tests/ConfigSources/iface_debug.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-int iface_src();
-
-int iface_debug();
diff --git a/Tests/ConfigSources/iface_debug_src.cpp b/Tests/ConfigSources/iface_debug_src.cpp
deleted file mode 100644
index 63b22fc..0000000
--- a/Tests/ConfigSources/iface_debug_src.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "iface_debug.h"
-
-int iface_debug()
-{
- return 0;
-}
diff --git a/Tests/ConfigSources/iface_src.cpp b/Tests/ConfigSources/iface_src.cpp
deleted file mode 100644
index c3a0c8f..0000000
--- a/Tests/ConfigSources/iface_src.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-int iface_src()
-{
- return 0;
-}
diff --git a/Tests/ConfigSources/main.cpp b/Tests/ConfigSources/main.cpp
index 71af72f..1c19e8d 100644
--- a/Tests/ConfigSources/main.cpp
+++ b/Tests/ConfigSources/main.cpp
@@ -1,7 +1,5 @@
-#include "iface_debug.h"
-
int main(int argc, char** argv)
{
- return iface_src() + iface_debug();
+ return 0;
}
diff --git a/Tests/RunCMake/TargetSources/OriginDebug-result.txt b/Tests/RunCMake/TargetSources/OriginDebug-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/TargetSources/OriginDebug-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt b/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
deleted file mode 100644
index 3bb6bf4..0000000
--- a/Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-CMake Debug Log at OriginDebug.cmake:13 \(add_library\):
- Used sources for target OriginDebug:
-
- \* empty_2.cpp
-
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
-+
-CMake Debug Log at OriginDebug.cmake:16 \(set_property\):
- Used sources for target OriginDebug:
-
- \* empty_3.cpp
-
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
-+
-CMake Debug Log at OriginDebug.cmake:20 \(target_sources\):
- Used sources for target OriginDebug:
-
- \* empty_4.cpp
-
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
-+
-CMake Debug Log at OriginDebug.cmake:14 \(target_link_libraries\):
- Used sources for target OriginDebug:
-
- \* empty_1.cpp
-
-Call Stack \(most recent call first\):
- CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/TargetSources/OriginDebug.cmake b/Tests/RunCMake/TargetSources/OriginDebug.cmake
deleted file mode 100644
index 5fe9ba7..0000000
--- a/Tests/RunCMake/TargetSources/OriginDebug.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-
-cmake_minimum_required(VERSION 3.0)
-
-project(OriginDebug)
-
-set(CMAKE_DEBUG_TARGET_PROPERTIES SOURCES)
-
-add_library(iface INTERFACE)
-set_property(TARGET iface PROPERTY INTERFACE_SOURCES
- empty_1.cpp
-)
-
-add_library(OriginDebug empty_2.cpp)
-target_link_libraries(OriginDebug iface)
-
-set_property(TARGET OriginDebug APPEND PROPERTY SOURCES
- empty_3.cpp
-)
-
-target_sources(OriginDebug PRIVATE empty_4.cpp)
diff --git a/Tests/RunCMake/TargetSources/OriginDebugIDE-result.txt b/Tests/RunCMake/TargetSources/OriginDebugIDE-result.txt
deleted file mode 100644
index 573541a..0000000
--- a/Tests/RunCMake/TargetSources/OriginDebugIDE-result.txt
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt b/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
deleted file mode 100644
index 358bfb3..0000000
--- a/Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-CMake Debug Log at OriginDebug.cmake:13 \(add_library\):
- Used sources for target OriginDebug:
-
- \* empty_2.cpp
-
-Call Stack \(most recent call first\):
- OriginDebugIDE.cmake:4 \(include\)
- CMakeLists.txt:3 \(include\)
-+
-CMake Debug Log at OriginDebug.cmake:16 \(set_property\):
- Used sources for target OriginDebug:
-
- \* empty_3.cpp
-
-Call Stack \(most recent call first\):
- OriginDebugIDE.cmake:4 \(include\)
- CMakeLists.txt:3 \(include\)
-+
-CMake Debug Log at OriginDebug.cmake:20 \(target_sources\):
- Used sources for target OriginDebug:
-
- \* empty_4.cpp
-
-Call Stack \(most recent call first\):
- OriginDebugIDE.cmake:4 \(include\)
- CMakeLists.txt:3 \(include\)
-+
-CMake Debug Log:
- Used sources for target OriginDebug:
-
- * .*CMakeLists.txt
-+
-CMake Debug Log at OriginDebug.cmake:14 \(target_link_libraries\):
- Used sources for target OriginDebug:
-
- \* empty_1.cpp
-
-Call Stack \(most recent call first\):
- OriginDebugIDE.cmake:4 \(include\)
- CMakeLists.txt:3 \(include\)
diff --git a/Tests/RunCMake/TargetSources/OriginDebugIDE.cmake b/Tests/RunCMake/TargetSources/OriginDebugIDE.cmake
deleted file mode 100644
index a3cc3a8..0000000
--- a/Tests/RunCMake/TargetSources/OriginDebugIDE.cmake
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# Separate test for the IDEs, because they show the CMakeLists.txt file
-# as a source file.
-include(${CMAKE_CURRENT_LIST_DIR}/OriginDebug.cmake)
diff --git a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
index b9095f9..1a3a7fa 100644
--- a/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
+++ b/Tests/RunCMake/TargetSources/RunCMakeTest.cmake
@@ -3,7 +3,4 @@ include(RunCMake)
if(RunCMake_GENERATOR MATCHES Xcode
OR RunCMake_GENERATOR MATCHES "Visual Studio")
run_cmake(ConfigNotAllowed)
- run_cmake(OriginDebugIDE)
-else()
- run_cmake(OriginDebug)
endif()
diff --git a/Tests/RunCMake/TargetSources/empty_3.cpp b/Tests/RunCMake/TargetSources/empty_3.cpp
deleted file mode 100644
index bfbbdde..0000000
--- a/Tests/RunCMake/TargetSources/empty_3.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int empty()
-{
- return 0;
-}
diff --git a/Tests/RunCMake/TargetSources/empty_4.cpp b/Tests/RunCMake/TargetSources/empty_4.cpp
deleted file mode 100644
index bfbbdde..0000000
--- a/Tests/RunCMake/TargetSources/empty_4.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifdef _WIN32
-__declspec(dllexport)
-#endif
-int empty()
-{
- return 0;
-}
diff --git a/Tests/SourcesProperty/CMakeLists.txt b/Tests/SourcesProperty/CMakeLists.txt
deleted file mode 100644
index 6c99e00..0000000
--- a/Tests/SourcesProperty/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-cmake_minimum_required(VERSION 3.0)
-
-project(SourcesProperty)
-
-add_library(iface INTERFACE)
-set_property(TARGET iface PROPERTY INTERFACE_SOURCES iface.cpp)
-
-add_executable(SourcesProperty main.cpp)
-target_link_libraries(SourcesProperty iface)
-
-set_property(TARGET SourcesProperty APPEND PROPERTY SOURCES prop.cpp)
diff --git a/Tests/SourcesProperty/iface.cpp b/Tests/SourcesProperty/iface.cpp
deleted file mode 100644
index e38ac37..0000000
--- a/Tests/SourcesProperty/iface.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-int iface()
-{
- return 0;
-}
diff --git a/Tests/SourcesProperty/iface.h b/Tests/SourcesProperty/iface.h
deleted file mode 100644
index 6da80a4..0000000
--- a/Tests/SourcesProperty/iface.h
+++ /dev/null
@@ -1,4 +0,0 @@
-
-int iface();
-
-int prop();
diff --git a/Tests/SourcesProperty/main.cpp b/Tests/SourcesProperty/main.cpp
deleted file mode 100644
index 33a97f4..0000000
--- a/Tests/SourcesProperty/main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "iface.h"
-
-int main(int argc, char** argv)
-{
- return iface() + prop();
-}
diff --git a/Tests/SourcesProperty/prop.cpp b/Tests/SourcesProperty/prop.cpp
deleted file mode 100644
index e343431..0000000
--- a/Tests/SourcesProperty/prop.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-
-int prop()
-{
- return 0;
-}
-----------------------------------------------------------------------
Summary of changes:
Help/command/target_sources.rst | 28 ---
Help/manual/cmake-commands.7.rst | 1 -
Help/manual/cmake-properties.7.rst | 1 -
Help/prop_tgt/INTERFACE_SOURCES.rst | 15 --
Help/prop_tgt/SOURCES.rst | 3 +-
Help/release/dev/target-INTERFACE_SOURCES.rst | 5 -
Help/release/dev/target-SOURCES-write.rst | 6 -
Help/release/dev/target_sources-command.rst | 5 -
Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst | 3 +-
Source/CMakeLists.txt | 1 -
Source/cmGeneratorExpressionDAGChecker.cxx | 12 -
Source/cmGeneratorExpressionDAGChecker.h | 5 +-
Source/cmGeneratorExpressionEvaluator.cxx | 7 +-
Source/cmTarget.cxx | 259 +++-----------------
Source/cmTarget.h | 13 +-
Source/cmTargetSourcesCommand.cxx | 64 -----
Source/cmTargetSourcesCommand.h | 55 -----
Tests/CMakeLists.txt | 1 -
Tests/ConfigSources/CMakeLists.txt | 8 -
Tests/ConfigSources/iface_debug.h | 4 -
Tests/ConfigSources/iface_debug_src.cpp | 7 -
Tests/ConfigSources/iface_src.cpp | 5 -
Tests/ConfigSources/main.cpp | 4 +-
.../RunCMake/TargetSources/OriginDebug-result.txt | 1 -
.../RunCMake/TargetSources/OriginDebug-stderr.txt | 31 ---
Tests/RunCMake/TargetSources/OriginDebug.cmake | 20 --
.../TargetSources/OriginDebugIDE-result.txt | 1 -
.../TargetSources/OriginDebugIDE-stderr.txt | 40 ---
Tests/RunCMake/TargetSources/OriginDebugIDE.cmake | 4 -
Tests/RunCMake/TargetSources/RunCMakeTest.cmake | 3 -
Tests/RunCMake/TargetSources/empty_3.cpp | 7 -
Tests/RunCMake/TargetSources/empty_4.cpp | 7 -
Tests/SourcesProperty/CMakeLists.txt | 12 -
Tests/SourcesProperty/iface.cpp | 5 -
Tests/SourcesProperty/iface.h | 4 -
Tests/SourcesProperty/main.cpp | 7 -
Tests/SourcesProperty/prop.cpp | 5 -
37 files changed, 45 insertions(+), 614 deletions(-)
delete mode 100644 Help/command/target_sources.rst
delete mode 100644 Help/prop_tgt/INTERFACE_SOURCES.rst
delete mode 100644 Help/release/dev/target-INTERFACE_SOURCES.rst
delete mode 100644 Help/release/dev/target-SOURCES-write.rst
delete mode 100644 Help/release/dev/target_sources-command.rst
delete mode 100644 Source/cmTargetSourcesCommand.cxx
delete mode 100644 Source/cmTargetSourcesCommand.h
delete mode 100644 Tests/ConfigSources/iface_debug.h
delete mode 100644 Tests/ConfigSources/iface_debug_src.cpp
delete mode 100644 Tests/ConfigSources/iface_src.cpp
delete mode 100644 Tests/RunCMake/TargetSources/OriginDebug-result.txt
delete mode 100644 Tests/RunCMake/TargetSources/OriginDebug-stderr.txt
delete mode 100644 Tests/RunCMake/TargetSources/OriginDebug.cmake
delete mode 100644 Tests/RunCMake/TargetSources/OriginDebugIDE-result.txt
delete mode 100644 Tests/RunCMake/TargetSources/OriginDebugIDE-stderr.txt
delete mode 100644 Tests/RunCMake/TargetSources/OriginDebugIDE.cmake
delete mode 100644 Tests/RunCMake/TargetSources/empty_3.cpp
delete mode 100644 Tests/RunCMake/TargetSources/empty_4.cpp
delete mode 100644 Tests/SourcesProperty/CMakeLists.txt
delete mode 100644 Tests/SourcesProperty/iface.cpp
delete mode 100644 Tests/SourcesProperty/iface.h
delete mode 100644 Tests/SourcesProperty/main.cpp
delete mode 100644 Tests/SourcesProperty/prop.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list