[Cmake-commits] CMake branch, next, updated. v2.8.3-829-g37929fe
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 37929fe34bdd226e05c78aa00a0f90a8d360fe4b (commit)
via 3bc828df9a0869f292de09ddcec306c16fe6d743 (commit)
from 1f70d7aa3829e8fab044a33f457449febab3180d (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=37929fe34bdd226e05c78aa00a0f90a8d360fe4b
commit 37929fe34bdd226e05c78aa00a0f90a8d360fe4b
Merge: 1f70d7a 3bc828d
Author: Marcus D. Hanwell marcus.hanw...@kitware.com
AuthorDate: Mon Dec 13 12:52:44 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 13 12:52:44 2010 -0500
Merge topic 'external-project-args-file' into next
3bc828d Fixed bug where last entry would be lost.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bc828df9a0869f292de09ddcec306c16fe6d743
commit 3bc828df9a0869f292de09ddcec306c16fe6d743
Author: Marcus D. Hanwell marcus.hanw...@kitware.com
AuthorDate: Mon Dec 13 12:50:38 2010 -0500
Commit: Marcus D. Hanwell marcus.hanw...@kitware.com
CommitDate: Mon Dec 13 12:50:38 2010 -0500
Fixed bug where last entry would be lost.
The code to build up a list was missing the final entry in an initial
cache.
diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index 542dbc2..a3590cf 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -579,6 +579,11 @@ function(_ep_write_initial_cache script_filename args)
set(accumulator ${accumulator};${line})
endif()
endforeach()
+ # Catch the final line of the args
+ if(setArg)
+set(setArg ${setArg}${accumulator}\ CACHE ${type} \Initial cache\
FORCE))
+set(script_initial_cache ${script_initial_cache}\n${setArg})
+ endif()
# Write out the initial cache file to the location specified.
if(NOT EXISTS ${script_filename}.in)
file(WRITE ${script_filename}.in \...@script_initial_cache\@\n)
---
Summary of changes:
Modules/ExternalProject.cmake |5 +
1 files changed, 5 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, next, updated. v2.8.3-832-ga3f94a4
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 a3f94a43b4b3db9a294801a3f810fcb6a4b59307 (commit)
via 8e82773eb4e2bb8d135479410393532021d3b85b (commit)
via 0621362668af7b5ec73689c75f6c9318425500f9 (commit)
from 37929fe34bdd226e05c78aa00a0f90a8d360fe4b (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=a3f94a43b4b3db9a294801a3f810fcb6a4b59307
commit a3f94a43b4b3db9a294801a3f810fcb6a4b59307
Merge: 37929fe 8e82773
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Dec 13 13:03:39 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 13 13:03:39 2010 -0500
Merge topic 'fix-INSTALL-and-PACKAGE-depend-tracing' into next
8e82773 Remove unused GLOBAL_TARGET generation code
0621362 Fix dependency tracing of INSTALL and PACKAGE (#11598)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e82773eb4e2bb8d135479410393532021d3b85b
commit 8e82773eb4e2bb8d135479410393532021d3b85b
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Dec 13 11:23:38 2010 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Dec 13 12:59:26 2010 -0500
Remove unused GLOBAL_TARGET generation code
Remove a boolean parameter of cmGlobalGenerator::CreateGlobalTarget that
is never set to true anymore. Remove global target consolidation loop
because no global targets exist before it runs anymore.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 15abd02..ea091f9 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -814,24 +814,11 @@ void cmGlobalGenerator::Generate()
// For each existing cmLocalGenerator
unsigned int i;
- // Consolidate global targets
+ // Put a copy of each global target in every directory.
cmTargets globalTargets;
this-CreateDefaultGlobalTargets(globalTargets);
for (i = 0; i this-LocalGenerators.size(); ++i)
{
-cmTargets* targets =
- (this-LocalGenerators[i]-GetMakefile()-GetTargets());
-cmTargets::iterator tarIt;
-for ( tarIt = targets-begin(); tarIt != targets-end(); ++ tarIt )
- {
- if ( tarIt-second.GetType() == cmTarget::GLOBAL_TARGET )
-{
-globalTargets[tarIt-first] = tarIt-second;
-}
- }
-}
- for (i = 0; i this-LocalGenerators.size(); ++i)
-{
cmMakefile* mf = this-LocalGenerators[i]-GetMakefile();
cmTargets* targets = (mf-GetTargets());
cmTargets::iterator tit;
@@ -1881,8 +1868,7 @@ cmTarget cmGlobalGenerator::CreateGlobalTarget(
const char* name, const char* message,
const cmCustomCommandLines* commandLines,
std::vectorstd::string depends,
- const char* workingDirectory,
- bool depends_on_all /* = false */)
+ const char* workingDirectory)
{
// Package
cmTarget target;
@@ -1897,10 +1883,6 @@ cmTarget cmGlobalGenerator::CreateGlobalTarget(
workingDirectory);
target.GetPostBuildCommands().push_back(cc);
target.SetProperty(EchoString, message);
- if ( depends_on_all )
-{
-target.AddUtility(all);
-}
std::vectorstd::string::iterator dit;
for ( dit = depends.begin(); dit != depends.end(); ++ dit )
{
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h
index 7e43124..6a1aa53 100644
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@@ -291,8 +291,7 @@ protected:
void CreateDefaultGlobalTargets(cmTargets* targets);
cmTarget CreateGlobalTarget(const char* name, const char* message,
const cmCustomCommandLines* commandLines,
-std::vectorstd::string depends, const char* workingDir,
- bool depends_on_all = false);
+std::vectorstd::string depends, const char* workingDir);
bool NeedSymbolicMark;
bool UseLinkScript;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0621362668af7b5ec73689c75f6c9318425500f9
commit 0621362668af7b5ec73689c75f6c9318425500f9
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Dec 13 11:26:53 2010 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Dec 13 12:56:47 2010 -0500
Fix dependency tracing of INSTALL and PACKAGE (#11598)
Commit e01cce28 (Allow add_dependencies() on imported targets,
2010-11-19) started using cmMakefile::FindTargetToUse to follow
dependencies, including those of GLOBAL_TARGETs like INSTALL and
PACKAGE. Since global targets exist in every directory, dependencies
between them must be traced within each directory too.
Teach FindTargetToUse to check the current directory before checking
globally.
[Cmake-commits] CMake branch, next, updated. v2.8.3-834-g1306474
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 1306474331ecf15bc048a4d0aff53f4f6ac4632d (commit)
via ce013215d27caebff882240968c9b0e9a6d230e2 (commit)
from a3f94a43b4b3db9a294801a3f810fcb6a4b59307 (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=1306474331ecf15bc048a4d0aff53f4f6ac4632d
commit 1306474331ecf15bc048a4d0aff53f4f6ac4632d
Merge: a3f94a4 ce01321
Author: Marcus D. Hanwell marcus.hanw...@kitware.com
AuthorDate: Mon Dec 13 13:27:21 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 13 13:27:21 2010 -0500
Merge topic 'vim-help' into next
ce01321 Inline help in vim with vertical split.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce013215d27caebff882240968c9b0e9a6d230e2
commit ce013215d27caebff882240968c9b0e9a6d230e2
Author: Matthias Kretz kr...@kde.org
AuthorDate: Mon Dec 13 13:15:43 2010 -0500
Commit: Marcus D. Hanwell marcus.hanw...@kitware.com
CommitDate: Mon Dec 13 13:25:27 2010 -0500
Inline help in vim with vertical split.
Added a small script to open a vertical split window with the output of
cmake --help-command for the word under the cursor.
diff --git a/Docs/cmake-help.vim b/Docs/cmake-help.vim
new file mode 100644
index 000..17cfa83
--- /dev/null
+++ b/Docs/cmake-help.vim
@@ -0,0 +1,21 @@
+nmap ,hc :call OpenCmakeHelp()CR
+
+function! OpenCmakeHelp()
+let s = getline( '.' )
+let i = col( '.' ) - 1
+while i 0 strpart( s, i, 1 ) =~ '[A-Za-z0-9_]'
+let i = i - 1
+endwhile
+while i col('$') strpart( s, i, 1 ) !~ '[A-Za-z0-9_]'
+let i = i + 1
+endwhile
+let start = match( s, '[A-Za-z0-9_]\+', i )
+let end = matchend( s, '[A-Za-z0-9_]\+', i )
+let ident = strpart( s, start, end - start )
+execute vertical new
+execute %!cmake --help-command .ident
+set nomodified
+set readonly
+endfunction
+
+autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in nmap F1 :call
OpenCmakeHelp()CR
---
Summary of changes:
Docs/cmake-help.vim | 21 +
1 files changed, 21 insertions(+), 0 deletions(-)
create mode 100644 Docs/cmake-help.vim
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.3-836-g09c5aa7
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 09c5aa789ce9aef2337c25ab4c56133b0bf9c802 (commit) via 8d366cd1ebc2a5937a40c4b44074852e3f7e7fae (commit) from 1306474331ecf15bc048a4d0aff53f4f6ac4632d (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=09c5aa789ce9aef2337c25ab4c56133b0bf9c802 commit 09c5aa789ce9aef2337c25ab4c56133b0bf9c802 Merge: 1306474 8d366cd Author: Eric Noulard eric.noul...@gmail.com AuthorDate: Mon Dec 13 14:16:28 2010 -0500 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Dec 13 14:16:28 2010 -0500 Merge topic 'CPackRPM-Fix0011595' into next 8d366cd CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d366cd1ebc2a5937a40c4b44074852e3f7e7fae commit 8d366cd1ebc2a5937a40c4b44074852e3f7e7fae Author: Eric NOULARD eric.noul...@gmail.com AuthorDate: Mon Dec 13 20:11:06 2010 +0100 Commit: Eric NOULARD eric.noul...@gmail.com CommitDate: Mon Dec 13 20:11:06 2010 +0100 CPackRPM fix bug 0011595 : Can't generate RPMs (on FC11...) diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake index ab909f4..026c45a 100644 --- a/Modules/CPackRPM.cmake +++ b/Modules/CPackRPM.cmake @@ -566,10 +566,9 @@ mv $RPM_BUILD_ROOT \\...@cpack_toplevel_directory\@/tmpBBroot\ %install if [ -e $RPM_BUILD_ROOT ]; then - mv \\...@cpack_toplevel_directory\@/tmpBBroot/*\ $RPM_BUILD_ROOT -else - mv \\...@cpack_toplevel_directory\@/tmpBBroot\ $RPM_BUILD_ROOT + rm -rf $RPM_BUILD_ROOT fi +mv \\...@cpack_toplevel_directory\@/tmpBBroot\ $RPM_BUILD_ROOT %clean --- Summary of changes: Modules/CPackRPM.cmake |5 ++--- 1 files changed, 2 insertions(+), 3 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.3-848-g67a4de1
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 67a4de115fac38e526aea034b0aded4cdb55269a (commit)
via 0053c8640027121b017052e1828221fc117d895d (commit)
from b06640cd9e1295b9af3f3525d955c67645a8e9ff (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=67a4de115fac38e526aea034b0aded4cdb55269a
commit 67a4de115fac38e526aea034b0aded4cdb55269a
Merge: b06640c 0053c86
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Dec 13 16:13:29 2010 -0500
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Dec 13 16:13:29 2010 -0500
Merge topic 'dev/add-response-file-support' into next
0053c86 Fix signed/unsigned integer comparison
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0053c8640027121b017052e1828221fc117d895d
commit 0053c8640027121b017052e1828221fc117d895d
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Dec 13 16:12:19 2010 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Dec 13 16:12:19 2010 -0500
Fix signed/unsigned integer comparison
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index b5afffb..28a7f2f 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -217,7 +217,7 @@ void cmSystemTools::ExpandResponseFiles(int ac, char** av,
argc = args.size();
argv = new char*[argc + 1];
- for(size_t i = 0; i argc; ++i)
+ for(int i = 0; i argc; ++i)
{
argv[i] = strdup(args[i].c_str());
}
---
Summary of changes:
Source/cmSystemTools.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
