[Cmake-commits] CMake branch, master, updated. v2.8.4-185-g1500dc6
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 1500dc6d437b477c5f6a775c7ca56ccc7c93c578 (commit) from 5c6a7bdbf28d090b4c554ccd3107d0037cd8c5cf (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=1500dc6d437b477c5f6a775c7ca56ccc7c93c578 commit 1500dc6d437b477c5f6a775c7ca56ccc7c93c578 Author: KWSys Robot AuthorDate: Tue Mar 15 00:01:05 2011 -0400 Commit: KWSys Robot CommitDate: Tue Mar 15 00:13:04 2011 -0400 KWSys Nightly Date Stamp diff --git a/Source/kwsys/kwsysDateStamp.cmake b/Source/kwsys/kwsysDateStamp.cmake index af1dc02..453d728 100644 --- a/Source/kwsys/kwsysDateStamp.cmake +++ b/Source/kwsys/kwsysDateStamp.cmake @@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2011) SET(KWSYS_DATE_STAMP_MONTH 03) # KWSys version date day component. Format is DD. -SET(KWSYS_DATE_STAMP_DAY 14) +SET(KWSYS_DATE_STAMP_DAY 15) --- 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
[Cmake-commits] CMake branch, next, updated. v2.8.4-1167-gf52ca8c
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 f52ca8cb9cde2165be133920c06f4ee85452814c (commit)
via 339d5922d9baef98c3a19fd0712badeb3d9e2996 (commit)
from f3487ceddc2e009f28ad7e8a51a9e2f160250b4e (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=f52ca8cb9cde2165be133920c06f4ee85452814c
commit f52ca8cb9cde2165be133920c06f4ee85452814c
Merge: f3487ce 339d592
Author: Brad King
AuthorDate: Mon Mar 14 17:54:07 2011 -0400
Commit: CMake Topic Stage
CommitDate: Mon Mar 14 17:54:07 2011 -0400
Merge topic 'validate-custom-commands-issue-11963' into next
339d592 Validate custom command arguments (#11963)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=339d5922d9baef98c3a19fd0712badeb3d9e2996
commit 339d5922d9baef98c3a19fd0712badeb3d9e2996
Author: Brad King
AuthorDate: Mon Mar 14 17:47:31 2011 -0400
Commit: Brad King
CommitDate: Mon Mar 14 17:49:30 2011 -0400
Validate custom command arguments (#11963)
Reject quoted commands immediately with an error message instead of
allowing a later assertion failure.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e14e44d..c36dd05 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -893,6 +893,20 @@ cmMakefile::AddCustomCommandToOutput(const
std::vector& outputs,
return;
}
+ // Validate custom commands. TODO: More strict?
+ for(cmCustomCommandLines::const_iterator i=commandLines.begin();
+ i != commandLines.end(); ++i)
+{
+cmCustomCommandLine const& cl = *i;
+if(!cl.empty() && !cl[0].empty() && cl[0][0] == '"')
+ {
+ cmOStringStream e;
+ e << "COMMAND may not contain literal quotes:\n " << cl[0] << "\n";
+ this->IssueMessage(cmake::FATAL_ERROR, e.str());
+ return;
+ }
+}
+
// Choose a source file on which to store the custom command.
cmSourceFile* file = 0;
if(main_dependency && main_dependency[0])
---
Summary of changes:
Source/cmMakefile.cxx | 14 ++
1 files changed, 14 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.4-1165-gf3487ce
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 f3487ceddc2e009f28ad7e8a51a9e2f160250b4e (commit)
via ade04de7ecc04e2b3e336e32789c8198b38ca986 (commit)
from c05ee313b130d3574ddf1277fa43bb694237c234 (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=f3487ceddc2e009f28ad7e8a51a9e2f160250b4e
commit f3487ceddc2e009f28ad7e8a51a9e2f160250b4e
Merge: c05ee31 ade04de
Author: Eric Noulard
AuthorDate: Mon Mar 14 16:13:02 2011 -0400
Commit: CMake Topic Stage
CommitDate: Mon Mar 14 16:13:02 2011 -0400
Merge topic 'CPackRPM-TestWithMoreTraces' into next
ade04de Remove debbuging typo
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ade04de7ecc04e2b3e336e32789c8198b38ca986
commit ade04de7ecc04e2b3e336e32789c8198b38ca986
Author: Eric NOULARD
AuthorDate: Mon Mar 14 21:12:26 2011 +0100
Commit: Eric NOULARD
CommitDate: Mon Mar 14 21:12:26 2011 +0100
Remove debbuging typo
diff --git a/Tests/CPackComponentsForAll/SystemSpecificInformations.cmake
b/Tests/CPackComponentsForAll/SystemSpecificInformations.cmake
index 942cb2b..8d11400 100644
--- a/Tests/CPackComponentsForAll/SystemSpecificInformations.cmake
+++ b/Tests/CPackComponentsForAll/SystemSpecificInformations.cmake
@@ -88,7 +88,7 @@ if(UNIX)
set(SPECIFIC_SYSTEM_VERSION_NAME "${CMAKE_SYSTEM_NAME}")
set(SPECIFIC_SYSTEM_PREFERED_CPACK_GENERATOR "TGZ")
find_program(LSB_RELEASE_EXECUTABLE lsb_release)
-if(LSB_RELEASE_EXECUTABLEF)
+if(LSB_RELEASE_EXECUTABLE)
execute_process(COMMAND ${LSB_RELEASE_EXECUTABLE} -i
OUTPUT_VARIABLE _TMP_LSB_RELEASE_OUTPUT
ERROR_QUIET
@@ -145,7 +145,7 @@ if(UNIX)
endif(LINUX_ISSUE MATCHES "SUSE")
# Mandriva case
# TODO
-endif(LSB_RELEASE_EXECUTABLEF)
+endif(LSB_RELEASE_EXECUTABLE)
# Now mangle some names
set(LINUX_NAME "${DISTRO_ID}_${DISTRO_RELEASE}")
if(DISTRO_ID MATCHES "Fedora|Mandriva|SUSE|OpenSUSE")
@@ -161,4 +161,4 @@ if(UNIX)
set(SPECIFIC_SYSTEM_VERSION_NAME
"${SPECIFIC_SYSTEM_VERSION_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
set(SPECIFIC_COMPILER_NAME "")
-endif(UNIX)
\ No newline at end of file
+endif(UNIX)
---
Summary of changes:
.../SystemSpecificInformations.cmake |6 +++---
1 files changed, 3 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.4-1163-gc05ee31
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 c05ee313b130d3574ddf1277fa43bb694237c234 (commit)
via c9d55ae5b9dceb90c735df72b7c487d0a75b2b62 (commit)
from 50252f3142468710e6399ecbaae08518ffb2eec9 (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=c05ee313b130d3574ddf1277fa43bb694237c234
commit c05ee313b130d3574ddf1277fa43bb694237c234
Merge: 50252f3 c9d55ae
Author: Brad King
AuthorDate: Mon Mar 14 15:37:27 2011 -0400
Commit: CMake Topic Stage
CommitDate: Mon Mar 14 15:37:27 2011 -0400
Merge topic 'module-link-interface-issue-11945' into next
c9d55ae Add parens in cmTarget::ComputeLinkInterface logic
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9d55ae5b9dceb90c735df72b7c487d0a75b2b62
commit c9d55ae5b9dceb90c735df72b7c487d0a75b2b62
Author: Brad King
AuthorDate: Mon Mar 14 15:34:26 2011 -0400
Commit: Brad King
CommitDate: Mon Mar 14 15:34:26 2011 -0400
Add parens in cmTarget::ComputeLinkInterface logic
Avoid GCC warning
warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]
added by commit c6a8e4c7 (The link interface of MODULE libraries is
empty, 2011-03-09).
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b5900c4..e8593a1 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4284,7 +4284,7 @@ bool cmTarget::ComputeLinkInterface(const char* config,
LinkInterface& iface)
bool canLinkModules = this->Makefile->NeedBackwardsCompatibility(2,2);
if(!explicitLibraries &&
(this->GetType() == cmTarget::EXECUTABLE ||
- this->GetType() == cmTarget::MODULE_LIBRARY && !canLinkModules))
+ (this->GetType() == cmTarget::MODULE_LIBRARY && !canLinkModules)))
{
return false;
}
---
Summary of changes:
Source/cmTarget.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.4-1161-g50252f3
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 50252f3142468710e6399ecbaae08518ffb2eec9 (commit) via 5c6a7bdbf28d090b4c554ccd3107d0037cd8c5cf (commit) via e5d85efef16adead57da630d98e43fecce3e1a70 (commit) via 22825b2b063d626b9c8309f51a9bc94a46479da0 (commit) from ce41ad395bf19d0568079be2cf60b24713001399 (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=50252f3142468710e6399ecbaae08518ffb2eec9 commit 50252f3142468710e6399ecbaae08518ffb2eec9 Merge: ce41ad3 5c6a7bd Author: Brad King AuthorDate: Mon Mar 14 09:26:09 2011 -0400 Commit: Brad King CommitDate: Mon Mar 14 09:26:09 2011 -0400 Merge branch 'master' into next --- 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
