[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1243-gb0e04b3
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 b0e04b33e8e46e20dbbd04c4fc6b378717e6f904 (commit)
via f3953103f6f91d5bf1359f1eb0162ad26a1ab2dc (commit)
from d02456cb18822f74e2c67e7e080ffdff486e815b (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=b0e04b33e8e46e20dbbd04c4fc6b378717e6f904
commit b0e04b33e8e46e20dbbd04c4fc6b378717e6f904
Merge: d02456c f395310
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 7 09:53:52 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 7 09:53:52 2012 -0500
Merge topic 'skip-variable-re-expansion' into next
f395310 Rename CMP0021 to CMP0019 and drop reserved spots in between
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3953103f6f91d5bf1359f1eb0162ad26a1ab2dc
commit f3953103f6f91d5bf1359f1eb0162ad26a1ab2dc
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 7 09:49:15 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Dec 7 09:50:19 2012 -0500
Rename CMP0021 to CMP0019 and drop reserved spots in between
The other policies under development using CMP0019 and CMP0020 will be
renumbered and added later. They may not be in 2.8.11 so it is simplest
to avoid confusion by not skipping any policy numbers.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2552689..d943c45 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -814,7 +814,7 @@ bool cmMakefile::NeedBackwardsCompatibility(unsigned int
major,
void cmMakefile::FinalPass()
{
// do all the variable expansions here
- this-ExpandVariablesCMP0021();
+ this-ExpandVariablesCMP0019();
// give all the commands a chance to do something
// after the file has been parsed before generation
@@ -2122,15 +2122,15 @@ void cmMakefile::AddExtraDirectory(const char* dir)
this-AuxSourceDirectories.push_back(dir);
}
-static bool mightExpandVariablesCMP0021(const char* s)
+static bool mightExpandVariablesCMP0019(const char* s)
{
return s *s strstr(s,${) strchr(s,'}');
}
-void cmMakefile::ExpandVariablesCMP0021()
+void cmMakefile::ExpandVariablesCMP0019()
{
// Drop this ancient compatibility behavior with a policy.
- cmPolicies::PolicyStatus pol = this-GetPolicyStatus(cmPolicies::CMP0021);
+ cmPolicies::PolicyStatus pol = this-GetPolicyStatus(cmPolicies::CMP0019);
if(pol != cmPolicies::OLD pol != cmPolicies::WARN)
{
return;
@@ -2138,7 +2138,7 @@ void cmMakefile::ExpandVariablesCMP0021()
cmOStringStream w;
const char *includeDirs = this-GetProperty(INCLUDE_DIRECTORIES);
- if(mightExpandVariablesCMP0021(includeDirs))
+ if(mightExpandVariablesCMP0019(includeDirs))
{
std::string dirs = includeDirs;
this-ExpandVariablesInString(dirs, true, true);
@@ -2158,7 +2158,7 @@ void cmMakefile::ExpandVariablesCMP0021()
{
cmTarget t = l-second;
includeDirs = t.GetProperty(INCLUDE_DIRECTORIES);
-if(mightExpandVariablesCMP0021(includeDirs))
+if(mightExpandVariablesCMP0019(includeDirs))
{
std::string dirs = includeDirs;
this-ExpandVariablesInString(dirs, true, true);
@@ -2176,7 +2176,7 @@ void cmMakefile::ExpandVariablesCMP0021()
for(std::vectorstd::string::iterator d = this-LinkDirectories.begin();
d != this-LinkDirectories.end(); ++d)
{
-if(mightExpandVariablesCMP0021(d-c_str()))
+if(mightExpandVariablesCMP0019(d-c_str()))
{
std::string orig = *d;
this-ExpandVariablesInString(*d, true, true);
@@ -2193,7 +2193,7 @@ void cmMakefile::ExpandVariablesCMP0021()
this-LinkLibraries.begin();
l != this-LinkLibraries.end(); ++l)
{
-if(mightExpandVariablesCMP0021(l-first.c_str()))
+if(mightExpandVariablesCMP0019(l-first.c_str()))
{
std::string orig = l-first;
this-ExpandVariablesInString(l-first, true, true);
@@ -2210,7 +2210,7 @@ void cmMakefile::ExpandVariablesCMP0021()
if(!w.str().empty())
{
cmOStringStream m;
-m this-GetPolicies()-GetPolicyWarning(cmPolicies::CMP0021)
+m this-GetPolicies()-GetPolicyWarning(cmPolicies::CMP0019)
\n
The following variable evaluations were encountered:\n
w.str();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 96a3d59..eff05d0 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -693,7 +693,7 @@ public:
/**
* Expand variables in the makefiles ivars such as link directories etc
*/
- void ExpandVariablesCMP0021();
+ void ExpandVariablesCMP0019();
/**
* Replace variables and #cmakedefine
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1248-g607d6b1
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 607d6b144c7c7a4622e1bbff1099aa0fc6a1e221 (commit)
via 11d6894279126d6789ebb4d14917a10829a4da1d (commit)
via a44480712cc9828c0cfc03db3108c220236d4da1 (commit)
from dcb4c478e1fb75c7b88e00c4fbf37275cf5052c4 (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=607d6b144c7c7a4622e1bbff1099aa0fc6a1e221
commit 607d6b144c7c7a4622e1bbff1099aa0fc6a1e221
Merge: dcb4c47 11d6894
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 7 14:04:24 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 7 14:04:24 2012 -0500
Merge topic 'xcode-framework-paths' into next
11d6894 Makefile: Use modern link information for framework search paths
a444807 Xcode: Remove old incorrect framework path computation (#13397)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=11d6894279126d6789ebb4d14917a10829a4da1d
commit 11d6894279126d6789ebb4d14917a10829a4da1d
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 7 13:27:52 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Dec 7 13:27:52 2012 -0500
Makefile: Use modern link information for framework search paths
Use cmComputeLinkInformation::GetFrameworkPaths to get the list of
framework paths needed by the linker. Drop the now unused framework
information from the old-style cmTarget link dependency analysis.
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index 2b89c79..9bf6b7d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1550,10 +1550,10 @@ std::string
cmMakefileTargetGenerator::GetFrameworkFlags()
this-LocalGenerator-GetIncludeDirectories(includes,
this-GeneratorTarget,
C, config);
- std::vectorstd::string::iterator i;
// check all include directories for frameworks as this
// will already have added a -F for the framework
- for(i = includes.begin(); i != includes.end(); ++i)
+ for(std::vectorstd::string::iterator i = includes.begin();
+ i != includes.end(); ++i)
{
if(this-Target-NameResolvesToFramework(i-c_str()))
{
@@ -1565,17 +1565,21 @@ std::string
cmMakefileTargetGenerator::GetFrameworkFlags()
}
std::string flags;
- std::vectorstd::string frameworks = this-Target-GetFrameworks();
- for(i = frameworks.begin();
- i != frameworks.end(); ++i)
+ const char* cfg = this-LocalGenerator-ConfigurationName.c_str();
+ if(cmComputeLinkInformation* cli = this-Target-GetLinkInformation(cfg))
{
-if(emitted.insert(*i).second)
+std::vectorstd::string const frameworks = cli-GetFrameworkPaths();
+for(std::vectorstd::string::const_iterator i = frameworks.begin();
+i != frameworks.end(); ++i)
{
- flags += -F;
- flags += this-Convert(i-c_str(),
- cmLocalGenerator::START_OUTPUT,
- cmLocalGenerator::SHELL, true);
- flags += ;
+ if(emitted.insert(*i).second)
+{
+flags += -F;
+flags += this-Convert(i-c_str(),
+ cmLocalGenerator::START_OUTPUT,
+ cmLocalGenerator::SHELL, true);
+flags += ;
+}
}
}
return flags;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index be20464..de3b23c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2093,26 +2093,6 @@ bool cmTarget::NameResolvesToFramework(const
std::string libname)
}
//
-bool cmTarget::AddFramework(const std::string libname, LinkLibraryType)
-{
- if(this-NameResolvesToFramework(libname.c_str()))
-{
-std::string frameworkDir = libname;
-frameworkDir += /../;
-frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
-std::vectorstd::string::iterator i =
- std::find(this-Frameworks.begin(),
-this-Frameworks.end(), frameworkDir);
-if(i == this-Frameworks.end())
- {
- this-Frameworks.push_back(frameworkDir);
- }
-return true;
-}
- return false;
-}
-
-//
void cmTarget::AddLinkLibrary(cmMakefile mf,
const char *target, const char* lib,
LinkLibraryType llt)
@@ -2122,7 +2102,6 @@ void cmTarget::AddLinkLibrary(cmMakefile
[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1253-gbb48cb2
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 bb48cb26fb6660e915777fa6285d00c45e24ea55 (commit)
via f0d938549eead63fb86bec28c299a1bceacbdd6b (commit)
via 2bc22bdaacfc0f0f91c229685dc5dbadd0267601 (commit)
from 8475dd356cfaad9caaee49223b42582f94d9d8db (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=bb48cb26fb6660e915777fa6285d00c45e24ea55
commit bb48cb26fb6660e915777fa6285d00c45e24ea55
Merge: 8475dd3 f0d9385
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 7 15:49:30 2012 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Dec 7 15:49:30 2012 -0500
Merge topic 'xcode-framework-paths' into next
f0d9385 Makefile: Use modern link information for framework search paths
2bc22bd Xcode: Add frameworks search paths from link dependeny closure
(#13397)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0d938549eead63fb86bec28c299a1bceacbdd6b
commit f0d938549eead63fb86bec28c299a1bceacbdd6b
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Dec 7 13:27:52 2012 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Dec 7 15:29:21 2012 -0500
Makefile: Use modern link information for framework search paths
Use cmComputeLinkInformation::GetFrameworkPaths to get the list of
framework paths needed by the linker. Drop the now unused framework
information from the old-style cmTarget link dependency analysis.
diff --git a/Source/cmMakefileTargetGenerator.cxx
b/Source/cmMakefileTargetGenerator.cxx
index 2b89c79..9bf6b7d 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -1550,10 +1550,10 @@ std::string
cmMakefileTargetGenerator::GetFrameworkFlags()
this-LocalGenerator-GetIncludeDirectories(includes,
this-GeneratorTarget,
C, config);
- std::vectorstd::string::iterator i;
// check all include directories for frameworks as this
// will already have added a -F for the framework
- for(i = includes.begin(); i != includes.end(); ++i)
+ for(std::vectorstd::string::iterator i = includes.begin();
+ i != includes.end(); ++i)
{
if(this-Target-NameResolvesToFramework(i-c_str()))
{
@@ -1565,17 +1565,21 @@ std::string
cmMakefileTargetGenerator::GetFrameworkFlags()
}
std::string flags;
- std::vectorstd::string frameworks = this-Target-GetFrameworks();
- for(i = frameworks.begin();
- i != frameworks.end(); ++i)
+ const char* cfg = this-LocalGenerator-ConfigurationName.c_str();
+ if(cmComputeLinkInformation* cli = this-Target-GetLinkInformation(cfg))
{
-if(emitted.insert(*i).second)
+std::vectorstd::string const frameworks = cli-GetFrameworkPaths();
+for(std::vectorstd::string::const_iterator i = frameworks.begin();
+i != frameworks.end(); ++i)
{
- flags += -F;
- flags += this-Convert(i-c_str(),
- cmLocalGenerator::START_OUTPUT,
- cmLocalGenerator::SHELL, true);
- flags += ;
+ if(emitted.insert(*i).second)
+{
+flags += -F;
+flags += this-Convert(i-c_str(),
+ cmLocalGenerator::START_OUTPUT,
+ cmLocalGenerator::SHELL, true);
+flags += ;
+}
}
}
return flags;
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index be20464..de3b23c 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2093,26 +2093,6 @@ bool cmTarget::NameResolvesToFramework(const
std::string libname)
}
//
-bool cmTarget::AddFramework(const std::string libname, LinkLibraryType)
-{
- if(this-NameResolvesToFramework(libname.c_str()))
-{
-std::string frameworkDir = libname;
-frameworkDir += /../;
-frameworkDir = cmSystemTools::CollapseFullPath(frameworkDir.c_str());
-std::vectorstd::string::iterator i =
- std::find(this-Frameworks.begin(),
-this-Frameworks.end(), frameworkDir);
-if(i == this-Frameworks.end())
- {
- this-Frameworks.push_back(frameworkDir);
- }
-return true;
-}
- return false;
-}
-
-//
void cmTarget::AddLinkLibrary(cmMakefile mf,
const char *target, const char* lib,
LinkLibraryType llt)
@@ -2122,7 +2102,6 @@ void
