[Cmake-commits] CMake branch, master, updated. v2.8.11.2-828-g1e11708
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, master has been updated via 1e11708a560f0d06867fb3f2a83149b224ef44ba (commit) via 38571f2c9446343a652cfdccea636028abd9f7aa (commit) from 92cc6539799b3236b184eea0506f8d22bf5c9035 (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=1e11708a560f0d06867fb3f2a83149b224ef44ba commit 1e11708a560f0d06867fb3f2a83149b224ef44ba Merge: 92cc653 38571f2 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Sep 9 11:01:56 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Sep 9 11:01:56 2013 -0400 Merge topic 'no_track_configured_files' 38571f2 cmMakefile: Do not track CMake temporary files. --- Summary of changes: Source/cmMakefile.cxx | 28 +++- 1 files changed, 19 insertions(+), 9 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4105-g323a040
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 323a0408bcc78f06b821f3eb3e44954d38e745ee (commit)
via f01dc72c582290390196f89593f32acf3e14b71f (commit)
from a3f2be517cda000cd608b99cebf7f1e2b82b58a5 (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=323a0408bcc78f06b821f3eb3e44954d38e745ee
commit 323a0408bcc78f06b821f3eb3e44954d38e745ee
Merge: a3f2be5 f01dc72
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Sep 9 15:11:52 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 9 15:11:52 2013 -0400
Merge topic 'authorative-LINK_LIBRARIES' into next
f01dc72 Use one authorative source of the LINK_LIBRARIES property.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f01dc72c582290390196f89593f32acf3e14b71f
commit f01dc72c582290390196f89593f32acf3e14b71f
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Aug 6 11:19:56 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Mon Sep 9 21:08:34 2013 +0200
Use one authorative source of the LINK_LIBRARIES property.
We populate and maintain a vector of structs to keep track of
backtraces already, so no need to populate the Properties container
additionally.
For completeness, it is necessary to remove the condition for
populating the vector for only valid library names and generator
expressions. That condition is now determined when evaluating the
generator expressions.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 147c332..d18d2b8 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2657,6 +2657,11 @@ void cmTarget::FinalizeSystemIncludeDirectories()
end = this-Internal-LinkInterfacePropertyEntries.end();
it != end; ++it)
{
+if (!cmGeneratorExpression::IsValidTargetName(it-Value)
+ cmGeneratorExpression::Find(it-Value) == std::string::npos)
+ {
+ continue;
+ }
{
cmListFileBacktrace lfbt;
cmGeneratorExpression ge(lfbt);
@@ -3033,15 +3038,11 @@ void cmTarget::SetProperty(const char* prop, const
char* value)
if (strcmp(prop, LINK_LIBRARIES) == 0)
{
this-Internal-LinkInterfacePropertyEntries.clear();
-if (cmGeneratorExpression::IsValidTargetName(value)
-|| cmGeneratorExpression::Find(value) != std::string::npos)
- {
- cmListFileBacktrace lfbt;
- this-Makefile-GetBacktrace(lfbt);
- cmValueWithOrigin entry(value, lfbt);
- this-Internal-LinkInterfacePropertyEntries.push_back(entry);
- }
-// Fall through
+cmListFileBacktrace lfbt;
+this-Makefile-GetBacktrace(lfbt);
+cmValueWithOrigin entry(value, lfbt);
+this-Internal-LinkInterfacePropertyEntries.push_back(entry);
+return;
}
this-Properties.SetProperty(prop, value, cmProperty::TARGET);
this-MaybeInvalidatePropertyCache(prop);
@@ -3099,15 +3100,11 @@ void cmTarget::AppendProperty(const char* prop, const
char* value,
}
if (strcmp(prop, LINK_LIBRARIES) == 0)
{
-if (cmGeneratorExpression::IsValidTargetName(value)
-|| cmGeneratorExpression::Find(value) != std::string::npos)
- {
- cmListFileBacktrace lfbt;
- this-Makefile-GetBacktrace(lfbt);
- cmValueWithOrigin entry(value, lfbt);
- this-Internal-LinkInterfacePropertyEntries.push_back(entry);
- }
-// Fall through
+cmListFileBacktrace lfbt;
+this-Makefile-GetBacktrace(lfbt);
+cmValueWithOrigin entry(value, lfbt);
+this-Internal-LinkInterfacePropertyEntries.push_back(entry);
+return;
}
this-Properties.AppendProperty(prop, value, cmProperty::TARGET, asString);
this-MaybeInvalidatePropertyCache(prop);
@@ -3387,6 +3384,11 @@ std::vectorstd::string
cmTarget::GetIncludeDirectories(const char *config)
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_ptrcmCompiledGeneratorExpression cge =
@@ -3585,6 +3587,11 @@ void
cmTarget::GetCompileOptions(std::vectorstd::string result,
end = this-Internal-LinkInterfacePropertyEntries.end();
it != end; ++it)
{
+ if (!cmGeneratorExpression::IsValidTargetName(it-Value)
+ cmGeneratorExpression::Find(it-Value) == std::string::npos)
+{
+continue;
+}
{
cmGeneratorExpression ge(lfbt);
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4103-ga3f2be5
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 a3f2be517cda000cd608b99cebf7f1e2b82b58a5 (commit)
via 7de465b7ef3aa61846d9c949357373058820614d (commit)
from 6ab8da837836b2d70f12882258038eac521ae5e8 (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=a3f2be517cda000cd608b99cebf7f1e2b82b58a5
commit a3f2be517cda000cd608b99cebf7f1e2b82b58a5
Merge: 6ab8da8 7de465b
Author: Daniele E. Domenichelli daniele.domeniche...@gmail.com
AuthorDate: Mon Sep 9 13:22:11 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Sep 9 13:22:11 2013 -0400
Merge topic 'FindGTK2-targets' into next
7de465b FindGTK2: Fail if freetype include directories are not found
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7de465b7ef3aa61846d9c949357373058820614d
commit 7de465b7ef3aa61846d9c949357373058820614d
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Mon Sep 9 19:20:51 2013 +0200
Commit: Daniele E. Domenichelli daniele.domeniche...@iit.it
CommitDate: Mon Sep 9 19:20:56 2013 +0200
FindGTK2: Fail if freetype include directories are not found
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake
index 738e022..a9f0d6e 100644
--- a/Modules/FindGTK2.cmake
+++ b/Modules/FindGTK2.cmake
@@ -760,6 +760,9 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
GTK2_GLIB_INCLUDE_DIR
GTK2_GLIBCONFIG_INCLUDE_DIR
GTK2_GLIB_LIBRARY
+
+FREETYPE_INCLUDE_DIR_ft2build
+FREETYPE_INCLUDE_DIR_freetype2
)
elseif(_GTK2_component STREQUAL gtkmm)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} Some or
all of the gtkmm libraries were not found.
---
Summary of changes:
Modules/FindGTK2.cmake |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.11.2-829-gb2ce2f5
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, master has been updated via b2ce2f5e48539f6fda04fbb5110e4e279c1c (commit) from 1e11708a560f0d06867fb3f2a83149b224ef44ba (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=b2ce2f5e48539f6fda04fbb5110e4e279c1c commit b2ce2f5e48539f6fda04fbb5110e4e279c1c Author: Kitware Robot kwro...@kitware.com AuthorDate: Tue Sep 10 00:01:10 2013 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Tue Sep 10 00:01:10 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 3003a3a..f5d6323 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -2,5 +2,5 @@ set(CMake_VERSION_MAJOR 2) set(CMake_VERSION_MINOR 8) set(CMake_VERSION_PATCH 11) -set(CMake_VERSION_TWEAK 20130909) +set(CMake_VERSION_TWEAK 20130910) #set(CMake_VERSION_RC 1) --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
