[Cmake-commits] CMake branch, master, updated. v2.8.2-507-g126158f
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 126158f0461589a7d27901be3f8e8d2eaade4fa8 (commit) via 225abc555de7499f4847e91de22523766541ce61 (commit) from c0665ca79572215a6f00804ec5c75f598682d465 (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=126158f0461589a7d27901be3f8e8d2eaade4fa8 commit 126158f0461589a7d27901be3f8e8d2eaade4fa8 Merge: c0665ca 225abc5 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Sep 28 14:02:44 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 28 14:02:44 2010 -0400 Merge topic 'fixAbsoluteDestHandlingRegression' 225abc5 InstallGen/CPack fix handling absolute installed file regression --- Summary of changes: Source/cmInstallGenerator.cxx |7 +-- 1 files changed, 5 insertions(+), 2 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.2-509-gc86d677
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 c86d677fe0456bebfe8e361038f3b1e37c9c285d (commit) via 25931ae10ed6b3bddc242ace16bed82dd2683596 (commit) from 126158f0461589a7d27901be3f8e8d2eaade4fa8 (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=c86d677fe0456bebfe8e361038f3b1e37c9c285d commit c86d677fe0456bebfe8e361038f3b1e37c9c285d Merge: 126158f 25931ae Author: Brad King brad.k...@kitware.com AuthorDate: Tue Sep 28 14:03:37 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 28 14:03:37 2010 -0400 Merge topic 'findqt4-cross-compile' 25931ae Fix regression in cross-compile patches with finding Qt libs. --- Summary of changes: Modules/FindQt4.cmake |4 +++- 1 files changed, 3 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
[Cmake-commits] CMake branch, master, updated. v2.8.2-513-g3398ec7
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 3398ec7d6f5bb6d25edbbd079df7058819c8d60e (commit) via 7ef659fcc3db3d11190526101f123992728794e0 (commit) from e66c12a2659df4fe74a199fb805969581676b36a (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=3398ec7d6f5bb6d25edbbd079df7058819c8d60e commit 3398ec7d6f5bb6d25edbbd079df7058819c8d60e Merge: e66c12a 7ef659f Author: Brad King brad.k...@kitware.com AuthorDate: Tue Sep 28 14:04:48 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 28 14:04:48 2010 -0400 Merge topic 'vs10-object-intdir' 7ef659f VS10: Use $(IntDir) for per-source output directory (#11270) --- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx |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
[Cmake-commits] CMake branch, master, updated. v2.8.2-515-gdbf7664
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 dbf7664c996037367119754e277f66ab84e52e84 (commit) via 567ac0bb1f1b89cd7c8b28435979a0ce023dca8a (commit) from 3398ec7d6f5bb6d25edbbd079df7058819c8d60e (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=dbf7664c996037367119754e277f66ab84e52e84 commit dbf7664c996037367119754e277f66ab84e52e84 Merge: 3398ec7 567ac0b Author: Brad King brad.k...@kitware.com AuthorDate: Tue Sep 28 14:05:15 2010 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Sep 28 14:05:15 2010 -0400 Merge topic 'PutRequiredVersionInDetailMessageInFPHSA' 567ac0b Also store the required version number in the details message. --- Summary of changes: Modules/FindPackageHandleStandardArgs.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
[Cmake-commits] CMake branch, next, updated. v2.8.2-949-g6dc009c
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 6dc009c46581435241af70ed54ab17c658ceddf4 (commit)
via 1c2e17f2afe4dfcb2dac543af4a21121722b38f9 (commit)
from ca68ba9354e7f9809b7cdc8c7a93898ab157775d (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=6dc009c46581435241af70ed54ab17c658ceddf4
commit 6dc009c46581435241af70ed54ab17c658ceddf4
Merge: ca68ba9 1c2e17f
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Sep 28 14:38:12 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 28 14:38:12 2010 -0400
Merge topic 'xcode_source_group_fix_7932' into next
1c2e17f XCode Source Grouping now allows for multiple levels of source
groups (7932).
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c2e17f2afe4dfcb2dac543af4a21121722b38f9
commit 1c2e17f2afe4dfcb2dac543af4a21121722b38f9
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Mon Sep 27 14:41:47 2010 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue Sep 28 14:36:56 2010 -0400
XCode Source Grouping now allows for multiple levels of source groups
(7932).
patch given by goatboy160, and updated by Claus Hofele.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 4e9969d..3603ddf 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2435,26 +2435,68 @@ void
cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
std::vectorcmSourceFile* classes = cmtarget.GetSourceFiles();
- for(std::vectorcmSourceFile*::const_iterator s = classes.begin();
+ for(std::vectorcmSourceFile*::const_iterator s = classes.begin();
s != classes.end(); s++)
{
cmSourceFile* sf = *s;
// Add the file to the list of sources.
std::string const source = sf-GetFullPath();
-cmSourceGroup sourceGroup =
+cmSourceGroup sourceGroup =
mf-FindSourceGroup(source.c_str(), sourceGroups);
-cmXCodeObject* pbxgroup =
- this-CreateOrGetPBXGroup(cmtarget, sourceGroup);
-cmStdString key = GetGroupMapKey(cmtarget, sf);
-this-GroupMap[key] = pbxgroup;
+sourceGroup.AssignSource( sf );
+}
+
+ // Create all of the groups that should be created for this target.
+ // Loop through every source group.
+ for(unsigned int i = 0; i sourceGroups.size(); ++i)
+{
+this-CreateSourceGroup( sourceGroups[i], cmtarget, false );
+}
+ }
+}
+}
+
+//
+cmXCodeObject* cmGlobalXCodeGenerator
+::CreateSourceGroup( cmSourceGroup sg, cmTarget cmtarget, bool child_group )
+{
+ // Only do something with the group if there are files or child groups
+ if( !sg.GetSourceFiles().empty() || !sg.GetGroupChildren().empty() )
+{
+cmXCodeObject* pbxgroup =
+ this-CreateOrGetPBXGroup(cmtarget, sg, !child_group);
+
+std::vectorconst cmSourceFile* sources = sg.GetSourceFiles();
+// Get all the source files and add them to the GroupMap
+for(std::vectorconst cmSourceFile*::const_iterator s = sources.begin();
+s != sources.end(); s++)
+ {
+ cmStdString key = GetGroupMapKey(cmtarget, (cmSourceFile*)*s);
+ this-GroupMap[key] = pbxgroup;
+ }
+
+// Do the child groups
+std::vectorcmSourceGroup children = sg.GetGroupChildren();
+cmXCodeObject* groupChildren = pbxgroup-GetObject(children);
+
+for(unsigned int i=0;ichildren.size();++i)
+ {
+ cmXCodeObject* group =
+this-CreateSourceGroup( children[i], cmtarget, true );
+ if (group)
+{
+groupChildren-AddObject(group);
}
}
-}
+return pbxgroup;
+}
+ return NULL;
}
+
//
cmXCodeObject* cmGlobalXCodeGenerator
-::CreateOrGetPBXGroup(cmTarget cmtarget, cmSourceGroup* sg)
+::CreateOrGetPBXGroup(cmTarget cmtarget, cmSourceGroup* sg, bool child_group)
{
cmStdString s = cmtarget.GetName();
s += /;
@@ -2496,9 +2538,8 @@ cmXCodeObject* cmGlobalXCodeGenerator
return tgroup;
}
- cmXCodeObject* tgroupChildren = tgroup-GetObject(children);
cmXCodeObject* group = this-CreateObject(cmXCodeObject::PBXGroup);
- cmXCodeObject* groupChildren =
+ cmXCodeObject* groupChildren =
this-CreateObject(cmXCodeObject::OBJECT_LIST);
group-AddAttribute(name, this-CreateString(sg-GetName()));
group-AddAttribute(children,
[Cmake-commits] CMake branch, next, updated. v2.8.2-953-g97ec9c3
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 97ec9c3b2fad7be5686b40c6484528441b4cd190 (commit)
via 19a9a1d57c84352461ce127fa2200e94ee308a52 (commit)
from 7075b00828e015cfb587d1a9141a2fd0ff671fee (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=97ec9c3b2fad7be5686b40c6484528441b4cd190
commit 97ec9c3b2fad7be5686b40c6484528441b4cd190
Merge: 7075b00 19a9a1d
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Sep 28 18:06:34 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 28 18:06:34 2010 -0400
Merge topic 'xcode_source_group_fix_7932' into next
19a9a1d Fix compile problem from previous commit.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19a9a1d57c84352461ce127fa2200e94ee308a52
commit 19a9a1d57c84352461ce127fa2200e94ee308a52
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Sep 28 18:05:54 2010 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue Sep 28 18:05:54 2010 -0400
Fix compile problem from previous commit.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 78df0e4..57f2f3a 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -2450,7 +2450,7 @@ void
cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
// Loop through every source group.
for(unsigned int idx = 0; idx sourceGroups.size(); ++idx)
{
-this-CreateSourceGroup( sourceGroups[i], cmtarget, false );
+this-CreateSourceGroup( sourceGroups[idx], cmtarget, false );
}
}
}
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx |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
[Cmake-commits] CMake branch, next, updated. v2.8.2-957-g1b0e592
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 1b0e5925cbfe295bbf1e3f8226fdb708ea9efb87 (commit)
via 1a92548ca29387d65472f63f8401532ae48f293a (commit)
via 4ebc277a7a64ff9ea93a1b67959c39c6d7bc892f (commit)
via 68fd37c39938635e992ec47bad2afa13150b9b3d (commit)
from 97ec9c3b2fad7be5686b40c6484528441b4cd190 (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=1b0e5925cbfe295bbf1e3f8226fdb708ea9efb87
commit 1b0e5925cbfe295bbf1e3f8226fdb708ea9efb87
Merge: 97ec9c3 1a92548
Author: Marcus D. Hanwell marcus.hanw...@kitware.com
AuthorDate: Tue Sep 28 18:52:41 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Sep 28 18:52:41 2010 -0400
Merge topic 'xcode_source_group_fix_7932' into next
1a92548 Revert previous commit in topic.
4ebc277 Revert Fix shadow warning in groups code.
68fd37c Revert Fix compile problem from previous commit.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a92548ca29387d65472f63f8401532ae48f293a
commit 1a92548ca29387d65472f63f8401532ae48f293a
Author: Marcus D. Hanwell marcus.hanw...@kitware.com
AuthorDate: Tue Sep 28 18:39:38 2010 -0400
Commit: Marcus D. Hanwell marcus.hanw...@kitware.com
CommitDate: Tue Sep 28 18:47:21 2010 -0400
Revert previous commit in topic.
Revert XCode Source Grouping now allows for multiple levels of source
groups (7932).
This reverts commit 1c2e17f2afe4dfcb2dac543af4a21121722b38f9.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 3603ddf..e238c2b 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -1073,7 +1073,7 @@ void
cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
std::vectorcmSourceFile*const classes = cmtarget.GetSourceFiles();
// add all the sources
std::vectorcmCustomCommand commands;
- for(std::vectorcmSourceFile*::const_iterator i = classes.begin();
+ for(std::vectorcmSourceFile*::const_iterator i = classes.begin();
i != classes.end(); ++i)
{
if((*i)-GetCustomCommand())
@@ -2443,14 +2443,10 @@ void
cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
std::string const source = sf-GetFullPath();
cmSourceGroup sourceGroup =
mf-FindSourceGroup(source.c_str(), sourceGroups);
-sourceGroup.AssignSource( sf );
-}
-
- // Create all of the groups that should be created for this target.
- // Loop through every source group.
- for(unsigned int i = 0; i sourceGroups.size(); ++i)
-{
-this-CreateSourceGroup( sourceGroups[i], cmtarget, false );
+cmXCodeObject* pbxgroup =
+ this-CreateOrGetPBXGroup(cmtarget, sourceGroup);
+cmStdString key = GetGroupMapKey(cmtarget, sf);
+this-GroupMap[key] = pbxgroup;
}
}
}
@@ -2458,45 +2454,7 @@ void
cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
//
cmXCodeObject* cmGlobalXCodeGenerator
-::CreateSourceGroup( cmSourceGroup sg, cmTarget cmtarget, bool child_group )
-{
- // Only do something with the group if there are files or child groups
- if( !sg.GetSourceFiles().empty() || !sg.GetGroupChildren().empty() )
-{
-cmXCodeObject* pbxgroup =
- this-CreateOrGetPBXGroup(cmtarget, sg, !child_group);
-
-std::vectorconst cmSourceFile* sources = sg.GetSourceFiles();
-// Get all the source files and add them to the GroupMap
-for(std::vectorconst cmSourceFile*::const_iterator s = sources.begin();
-s != sources.end(); s++)
- {
- cmStdString key = GetGroupMapKey(cmtarget, (cmSourceFile*)*s);
- this-GroupMap[key] = pbxgroup;
- }
-
-// Do the child groups
-std::vectorcmSourceGroup children = sg.GetGroupChildren();
-cmXCodeObject* groupChildren = pbxgroup-GetObject(children);
-
-for(unsigned int i=0;ichildren.size();++i)
- {
- cmXCodeObject* group =
-this-CreateSourceGroup( children[i], cmtarget, true );
- if (group)
-{
-groupChildren-AddObject(group);
-}
- }
-return pbxgroup;
-}
- return NULL;
-}
-
-
-//
-cmXCodeObject* cmGlobalXCodeGenerator
-::CreateOrGetPBXGroup(cmTarget cmtarget, cmSourceGroup* sg, bool child_group)
+::CreateOrGetPBXGroup(cmTarget cmtarget, cmSourceGroup* sg)
{
cmStdString s = cmtarget.GetName();
s += /;
@@ -2517,7 +2475,7 @@ cmXCodeObject*
[Cmake-commits] CMake branch, master, updated. v2.8.2-519-g0f6b3a0
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 0f6b3a0059c2b9d10cb24af0203be2abb8c1 (commit) from d24b8acc1a0df5bae8294a55cba105f707416b1b (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=0f6b3a0059c2b9d10cb24af0203be2abb8c1 commit 0f6b3a0059c2b9d10cb24af0203be2abb8c1 Author: KWSys Robot kwro...@kitware.com AuthorDate: Wed Sep 29 00:01:05 2010 -0400 Commit: KWSys Robot kwro...@kitware.com CommitDate: Wed Sep 29 00:10:08 2010 -0400 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index 98fc895..2863f87 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2010) SET(KWSYS_DATE_STAMP_MONTH 09) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 28) +SET(KWSYS_DATE_STAMP_DAY 29) --- Summary of changes: Source/kwsys/kwsysDateStamp.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
