[Cmake-commits] CMake branch, master, updated. v2.8.11.2-867-gb89cedd
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 b89cedd112ec6767e366f11837719915971761df (commit) from 6e3fe5570345bf18f71851f2299d5c43ee05e021 (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=b89cedd112ec6767e366f11837719915971761df commit b89cedd112ec6767e366f11837719915971761df Author: Kitware Robot AuthorDate: Thu Sep 26 00:01:16 2013 -0400 Commit: Kitware Robot CommitDate: Thu Sep 26 00:01:16 2013 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 31311bb..8966ebb 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 20130925) +set(CMake_VERSION_TWEAK 20130926) #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
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4339-g0f00141
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 0f00141f04260d9cb415db261c48068ad9885f95 (commit) via 6e3fe5570345bf18f71851f2299d5c43ee05e021 (commit) from 9aca8db082e10e6e3bfc4cc4a1abcc1afb247479 (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=0f00141f04260d9cb415db261c48068ad9885f95 commit 0f00141f04260d9cb415db261c48068ad9885f95 Merge: 9aca8db 6e3fe55 Author: Brad King AuthorDate: Wed Sep 25 16:35:24 2013 -0400 Commit: Brad King CommitDate: Wed Sep 25 16:35:24 2013 -0400 Merge branch 'master' into next --- Summary of changes: 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-866-g6e3fe55
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 6e3fe5570345bf18f71851f2299d5c43ee05e021 (commit) via a8d7141d2b39caa5d98cd85c9c656e2a7ae948e5 (commit) from 951a158c8a89512f52779ea29731234fa25b90e5 (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=6e3fe5570345bf18f71851f2299d5c43ee05e021 commit 6e3fe5570345bf18f71851f2299d5c43ee05e021 Merge: 951a158 a8d7141 Author: Brad King AuthorDate: Wed Sep 25 16:37:54 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 16:37:54 2013 -0400 Merge topic 'bash-completion-future-filter' a8d7141 bash-completion: Future-proof --help-*-list "c version" filtering --- Summary of changes: Docs/bash-completion/cmake |8 Docs/bash-completion/cpack |6 +++--- Docs/bash-completion/ctest |2 +- 3 files changed, 8 insertions(+), 8 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-4337-g9aca8db
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 9aca8db082e10e6e3bfc4cc4a1abcc1afb247479 (commit) via afa2328833cdaa75a1060d6b07e52d52cf827282 (commit) via f0562fbf02f97608c9e4c50a12214dd94c928ac1 (commit) from 2e1370e4bedf26ddb7dbf7d8176de483f0f770db (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=9aca8db082e10e6e3bfc4cc4a1abcc1afb247479 commit 9aca8db082e10e6e3bfc4cc4a1abcc1afb247479 Merge: 2e1370e afa2328 Author: Brad King AuthorDate: Wed Sep 25 16:24:17 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 16:24:17 2013 -0400 Merge topic 'concepts-help' into next afa2328 Add documentation about CMake policies. f0562fb Add infrastructure for documentation on CMake concepts. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=afa2328833cdaa75a1060d6b07e52d52cf827282 commit afa2328833cdaa75a1060d6b07e52d52cf827282 Author: Stephen Kelly AuthorDate: Sat Sep 14 09:42:39 2013 +0200 Commit: Brad King CommitDate: Wed Sep 25 16:20:57 2013 -0400 Add documentation about CMake policies. diff --git a/Source/cmDocumentConcepts.cxx b/Source/cmDocumentConcepts.cxx index cb4a734..2c2a2ae 100644 --- a/Source/cmDocumentConcepts.cxx +++ b/Source/cmDocumentConcepts.cxx @@ -11,6 +11,25 @@ */ #include "cmDocumentConcepts.h" -void cmDocumentConcepts::GetDocumentation(std::vector&) +void cmDocumentConcepts::GetDocumentation(std::vector&v) { + v.push_back(cmDocumentationEntry("policies", +"Policies and minimum version settings", +"Policies in CMake are used to preserve backward compatible behavior " +"across multiple releases. When a new policy is introduced, newer CMake " +"versions will begin to warn about the backward compatible behavior. It " +"is possible to disable the warning by explicitly requesting the OLD, or" +"backward compatible behavior using the cmake_policy command. It is " +"also possible to request NEW, or non-backward compatible behavior for a " +"policy." +"\n" +"The cmake_minimum_required() command does more than report an error if " +"a too-old version of CMake is used to build a project. It also sets " +"all policies introduced in that CMake version or earlier to NEW " +"behavior." +"\n" +"The CMAKE_MINIMUM_REQUIRED_VERSION variable may also be used to " +"determine whether to report an error on use of deprecated macros or " +"functions." + )); } http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0562fbf02f97608c9e4c50a12214dd94c928ac1 commit f0562fbf02f97608c9e4c50a12214dd94c928ac1 Author: Stephen Kelly AuthorDate: Wed Sep 11 13:16:25 2013 +0200 Commit: Brad King CommitDate: Wed Sep 25 16:20:57 2013 -0400 Add infrastructure for documentation on CMake concepts. Follow the same pattern as other documentation sections. diff --git a/Docs/bash-completion/cmake b/Docs/bash-completion/cmake index 59e0298..ca04b2e 100644 --- a/Docs/bash-completion/cmake +++ b/Docs/bash-completion/cmake @@ -134,6 +134,11 @@ _cmake() 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; + --help-concept) +COMPREPLY=( $( compgen -W '$( cmake --help-concept-list \ +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) +return +;; esac $split && return diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 8412e3e..d5a5335 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -166,6 +166,8 @@ set(SRCS cmDocumentationFormatterUsage.cxx cmDocumentationSection.cxx cmDocumentCompileDefinitions.h + cmDocumentConcepts.h + cmDocumentConcepts.cxx cmDocumentGeneratorExpressions.h cmDocumentLocationUndefined.h cmDocumentVariables.cxx diff --git a/Source/cmDocumentConcepts.cxx b/Source/cmDocumentConcepts.cxx new file mode 100644 index 000..cb4a734 --- /dev/null +++ b/Source/cmDocumentConcepts.cxx @@ -0,0 +1,16 @@ +/* + CMake - Cross Platform Makefile Generator + Copyright 2013 Stephen Kelly + + Distributed under the OSI-approved BSD License (the "License"); + see accompanying file Copyright.txt for details. + + This software is distributed WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + See the License for more information. +
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4334-g2e1370e
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 2e1370e4bedf26ddb7dbf7d8176de483f0f770db (commit) via fdbaafce4fa3de7c0106a47bc5cfcf57cacd038c (commit) via a8d7141d2b39caa5d98cd85c9c656e2a7ae948e5 (commit) from 64087d26d276fa5dac7e0c9ad98d1782a8fa5153 (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=2e1370e4bedf26ddb7dbf7d8176de483f0f770db commit 2e1370e4bedf26ddb7dbf7d8176de483f0f770db Merge: 64087d2 fdbaafc Author: Brad King AuthorDate: Wed Sep 25 16:21:55 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 16:21:55 2013 -0400 Merge topic 'concepts-help' into next fdbaafc Merge branch 'bash-completion-future-filter' into concepts-help a8d7141 bash-completion: Future-proof --help-*-list "c version" filtering http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdbaafce4fa3de7c0106a47bc5cfcf57cacd038c commit fdbaafce4fa3de7c0106a47bc5cfcf57cacd038c Merge: 98caac2 a8d7141 Author: Brad King AuthorDate: Wed Sep 25 16:18:02 2013 -0400 Commit: Brad King CommitDate: Wed Sep 25 16:18:17 2013 -0400 Merge branch 'bash-completion-future-filter' into concepts-help Resolve a logical conflict in Docs/bash-completion/cmake by applying the change from 'bash-completion-future-filter' to the new hunk added by 'concepts-help'. diff --cc Docs/bash-completion/cmake index b90cce5,59e0298..ca04b2e --- a/Docs/bash-completion/cmake +++ b/Docs/bash-completion/cmake @@@ -131,14 -131,9 +131,14 @@@ _cmake( ;; --help-variable) COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \ - 2>/dev/null | tail -n +2 )' -- "$cur" ) ) + 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; + --help-concept) +COMPREPLY=( $( compgen -W '$( cmake --help-concept-list \ - 2>/dev/null | tail -n +2 )' -- "$cur" ) ) ++2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) +return +;; esac $split && return http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a8d7141d2b39caa5d98cd85c9c656e2a7ae948e5 commit a8d7141d2b39caa5d98cd85c9c656e2a7ae948e5 Author: Brad King AuthorDate: Mon Sep 23 13:31:03 2013 -0400 Commit: Brad King CommitDate: Wed Sep 25 16:16:54 2013 -0400 bash-completion: Future-proof --help-*-list "c version" filtering A future version of CMake may not print the "cmake version" line at the beginning of the --help-*-list output. Filter out the line with 'grep' instead of 'tail' to tolerate output from versions of CMake with and without the version line. Match "cmake version", "cpack version", and "ctest version" in each corresponding completion script. diff --git a/Docs/bash-completion/cmake b/Docs/bash-completion/cmake index 5f33c09..59e0298 100644 --- a/Docs/bash-completion/cmake +++ b/Docs/bash-completion/cmake @@ -111,12 +111,12 @@ _cmake() ;; --help-command) COMPREPLY=( $( compgen -W '$( cmake --help-command-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-module) COMPREPLY=( $( compgen -W '$( cmake --help-module-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-policy) @@ -126,12 +126,12 @@ _cmake() ;; --help-property) COMPREPLY=( $( compgen -W '$( cmake --help-property-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-variable) COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; esac diff --git a/Docs/bash-completion/cpack b/Docs/bash-completion/cpack index 51638c5..9ab6048 100644 --- a/Docs/bash-completion/cpack +++ b/Docs/bash-completion/cpack @@ -20,7 +20,7 @@ _cpack() -D) [[ $cur == *=* ]] && return # no completion for values COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ -2>/dev/null | tail -n +2 )' -S = -- "$cur" ) ) +2>/dev/null | grep -v "^cpack
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4331-g64087d2
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 64087d26d276fa5dac7e0c9ad98d1782a8fa5153 (commit) via 058045fadd66456bed36ee6511a6bb8d823e2b25 (commit) from eef9a95245072d79f6b5c421eb3bfdf798e73692 (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=64087d26d276fa5dac7e0c9ad98d1782a8fa5153 commit 64087d26d276fa5dac7e0c9ad98d1782a8fa5153 Merge: eef9a95 058045f Author: Brad King AuthorDate: Wed Sep 25 16:00:05 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 16:00:05 2013 -0400 Merge topic 'bash-completion-future-filter' into next 058045f bash-completion: Future-proof --help-*-list "c version" filtering http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=058045fadd66456bed36ee6511a6bb8d823e2b25 commit 058045fadd66456bed36ee6511a6bb8d823e2b25 Author: Brad King AuthorDate: Mon Sep 23 13:31:03 2013 -0400 Commit: Brad King CommitDate: Wed Sep 25 15:56:55 2013 -0400 bash-completion: Future-proof --help-*-list "c version" filtering A future version of CMake may not print the "cmake version" line at the beginning of the --help-*-list output. Filter out the line with 'grep' instead of 'tail' to tolerate output from versions of CMake with and without the version line. Match "cmake version", "cpack version", and "ctest version" in each corresponding completion script. diff --git a/Docs/bash-completion/cmake b/Docs/bash-completion/cmake index b90cce5..ca04b2e 100644 --- a/Docs/bash-completion/cmake +++ b/Docs/bash-completion/cmake @@ -111,12 +111,12 @@ _cmake() ;; --help-command) COMPREPLY=( $( compgen -W '$( cmake --help-command-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-module) COMPREPLY=( $( compgen -W '$( cmake --help-module-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-policy) @@ -126,17 +126,17 @@ _cmake() ;; --help-property) COMPREPLY=( $( compgen -W '$( cmake --help-property-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-variable) COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-concept) COMPREPLY=( $( compgen -W '$( cmake --help-concept-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; esac diff --git a/Docs/bash-completion/cpack b/Docs/bash-completion/cpack index 51638c5..9ab6048 100644 --- a/Docs/bash-completion/cpack +++ b/Docs/bash-completion/cpack @@ -20,7 +20,7 @@ _cpack() -D) [[ $cur == *=* ]] && return # no completion for values COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ -2>/dev/null | tail -n +2 )' -S = -- "$cur" ) ) +2>/dev/null | grep -v "^cpack version " )' -S = -- "$cur" ) ) compopt -o nospace return ;; @@ -38,12 +38,12 @@ _cpack() ;; --help-command) COMPREPLY=( $( compgen -W '$( cpack --help-command-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^cpack version " )' -- "$cur" ) ) return ;; --help-variable) COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cpack version " )' -- "$cur" ) ) return ;; esac diff --git a/Docs/bash-completion/ctest b/Docs/bash-completion/ctest index 7433d3d..25cb998 100644 --- a/Docs/bash-completion/ctest +++ b/Docs/bash-completion/ctest @@ -63,7 +63,7 @@ _ctest() ;; --help-command) COMPREPLY=( $( compgen -W '$( ctest --help-command-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^ctest version " )' -- "$cur" ) ) return ;; esac ---
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4329-geef9a95
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 eef9a95245072d79f6b5c421eb3bfdf798e73692 (commit) via 2b6e4cd680f6493cb1cdbfa95d0a4448927d16fe (commit) from 18b0f44dbdd0fdd07aa9ddcd0d0e72bc55e81c64 (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=eef9a95245072d79f6b5c421eb3bfdf798e73692 commit eef9a95245072d79f6b5c421eb3bfdf798e73692 Merge: 18b0f44 2b6e4cd Author: Brad King AuthorDate: Wed Sep 25 15:54:16 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 15:54:16 2013 -0400 Merge topic 'bash-completion-future-filter' into next 2b6e4cd bash-completion: Fix filtering of cpack and ctest version lines http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b6e4cd680f6493cb1cdbfa95d0a4448927d16fe commit 2b6e4cd680f6493cb1cdbfa95d0a4448927d16fe Author: Brad King AuthorDate: Wed Sep 25 15:51:00 2013 -0400 Commit: Brad King CommitDate: Wed Sep 25 15:51:00 2013 -0400 bash-completion: Fix filtering of cpack and ctest version lines diff --git a/Docs/bash-completion/cpack b/Docs/bash-completion/cpack index e3f611e..9ab6048 100644 --- a/Docs/bash-completion/cpack +++ b/Docs/bash-completion/cpack @@ -20,7 +20,7 @@ _cpack() -D) [[ $cur == *=* ]] && return # no completion for values COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ -2>/dev/null | grep -v "^cmake version " )' -S = -- "$cur" ) ) +2>/dev/null | grep -v "^cpack version " )' -S = -- "$cur" ) ) compopt -o nospace return ;; @@ -38,12 +38,12 @@ _cpack() ;; --help-command) COMPREPLY=( $( compgen -W '$( cpack --help-command-list 2>/dev/null| -grep -v "^cmake version " )' -- "$cur" ) ) +grep -v "^cpack version " )' -- "$cur" ) ) return ;; --help-variable) COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ -2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) +2>/dev/null | grep -v "^cpack version " )' -- "$cur" ) ) return ;; esac diff --git a/Docs/bash-completion/ctest b/Docs/bash-completion/ctest index 0158a54..25cb998 100644 --- a/Docs/bash-completion/ctest +++ b/Docs/bash-completion/ctest @@ -63,7 +63,7 @@ _ctest() ;; --help-command) COMPREPLY=( $( compgen -W '$( ctest --help-command-list 2>/dev/null| -grep -v "^cmake version " )' -- "$cur" ) ) +grep -v "^ctest version " )' -- "$cur" ) ) return ;; esac --- Summary of changes: Docs/bash-completion/cpack |6 +++--- Docs/bash-completion/ctest |2 +- 2 files changed, 4 insertions(+), 4 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-4327-g18b0f44
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 18b0f44dbdd0fdd07aa9ddcd0d0e72bc55e81c64 (commit) via c5ee80b693f899e1595011c98b4550810f027712 (commit) from 8a5a07b0d82aeb95b6f5623b9528efeec11017ca (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=18b0f44dbdd0fdd07aa9ddcd0d0e72bc55e81c64 commit 18b0f44dbdd0fdd07aa9ddcd0d0e72bc55e81c64 Merge: 8a5a07b c5ee80b Author: Brad King AuthorDate: Wed Sep 25 11:39:59 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 11:39:59 2013 -0400 Merge topic 'bash-completion-future-filter' into next c5ee80b bash-completion: Future-proof --help-*-list "cmake version" filtering diff --cc Docs/bash-completion/cmake index b90cce5,59e0298..abc5de5 --- a/Docs/bash-completion/cmake +++ b/Docs/bash-completion/cmake @@@ -131,14 -131,9 +131,14 @@@ _cmake( ;; --help-variable) COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \ - 2>/dev/null | tail -n +2 )' -- "$cur" ) ) + 2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; + --help-concept) +COMPREPLY=( $( compgen -W '$( cmake --help-concept-list \ +2>/dev/null | tail -n +2 )' -- "$cur" ) ) +return +;; esac $split && return http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5ee80b693f899e1595011c98b4550810f027712 commit c5ee80b693f899e1595011c98b4550810f027712 Author: Brad King AuthorDate: Mon Sep 23 13:31:03 2013 -0400 Commit: Brad King CommitDate: Wed Sep 25 11:35:12 2013 -0400 bash-completion: Future-proof --help-*-list "cmake version" filtering A future version of CMake may not print the "cmake version" line at the beginning of the --help-*-list output. Filter out the line with 'grep' instead of 'tail' to tolerate output from versions of CMake with and without the version line. diff --git a/Docs/bash-completion/cmake b/Docs/bash-completion/cmake index 5f33c09..59e0298 100644 --- a/Docs/bash-completion/cmake +++ b/Docs/bash-completion/cmake @@ -111,12 +111,12 @@ _cmake() ;; --help-command) COMPREPLY=( $( compgen -W '$( cmake --help-command-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-module) COMPREPLY=( $( compgen -W '$( cmake --help-module-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-policy) @@ -126,12 +126,12 @@ _cmake() ;; --help-property) COMPREPLY=( $( compgen -W '$( cmake --help-property-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-variable) COMPREPLY=( $( compgen -W '$( cmake --help-variable-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; esac diff --git a/Docs/bash-completion/cpack b/Docs/bash-completion/cpack index 51638c5..e3f611e 100644 --- a/Docs/bash-completion/cpack +++ b/Docs/bash-completion/cpack @@ -20,7 +20,7 @@ _cpack() -D) [[ $cur == *=* ]] && return # no completion for values COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ -2>/dev/null | tail -n +2 )' -S = -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -S = -- "$cur" ) ) compopt -o nospace return ;; @@ -38,12 +38,12 @@ _cpack() ;; --help-command) COMPREPLY=( $( compgen -W '$( cpack --help-command-list 2>/dev/null| -tail -n +2 )' -- "$cur" ) ) +grep -v "^cmake version " )' -- "$cur" ) ) return ;; --help-variable) COMPREPLY=( $( compgen -W '$( cpack --help-variable-list \ -2>/dev/null | tail -n +2 )' -- "$cur" ) ) +2>/dev/null | grep -v "^cmake version " )' -- "$cur" ) ) return ;; esac diff --git a/Docs/bash-completion/ctest b/Docs/bash-completion/ctest index 7433d3d..0158a54 100644 --- a/Docs/bash-completion/ctest +++ b/Docs/bash-completion/ctest @@ -63,7
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4325-g8a5a07b
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 8a5a07b0d82aeb95b6f5623b9528efeec11017ca (commit) via 02573eaedd2bb4027077b6915b9cebbcd8f46671 (commit) via d10d111fba33de55ed1f6178b22c5dad200b9983 (commit) from 52369f40a223797f8682717de3210975d12c90ad (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=8a5a07b0d82aeb95b6f5623b9528efeec11017ca commit 8a5a07b0d82aeb95b6f5623b9528efeec11017ca Merge: 52369f4 02573ea Author: Zack Galbreath AuthorDate: Wed Sep 25 10:52:46 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 10:52:46 2013 -0400 Merge topic 'ctest_rerun_failed' into next 02573ea Require WORKING_DIRECTORY for RerunFailed test d10d111 clean up dashboard http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02573eaedd2bb4027077b6915b9cebbcd8f46671 commit 02573eaedd2bb4027077b6915b9cebbcd8f46671 Author: Zack Galbreath AuthorDate: Wed Sep 25 10:50:24 2013 -0400 Commit: Zack Galbreath CommitDate: Wed Sep 25 10:50:24 2013 -0400 Require WORKING_DIRECTORY for RerunFailed test The RerunFailed test won't behave properly if the test property WORKING_DIRECTORY is not honored. Therefore, we now only run this test if we are building using CMake 2.8.4 or newer. diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 75735dd..d1b1b43 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2139,12 +2139,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ set_tests_properties(CTestTestTimeout PROPERTIES PASS_REGULAR_EXPRESSION "TestTimeout *\\.+ *\\*\\*\\*Timeout.*CheckChild *\\.+ *Passed") - add_test( -NAME CTestTestRerunFailed -COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed) - set_tests_properties(CTestTestRerunFailed PROPERTIES -PASS_REGULAR_EXPRESSION "1/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout -WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout) + # this test only runs correctly if WORKING_DIRECTORY is honored. + if (NOT CMAKE_VERSION VERSION_LESS "2.8.4") +add_test( + NAME CTestTestRerunFailed + COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed) +set_tests_properties(CTestTestRerunFailed PROPERTIES + PASS_REGULAR_EXPRESSION "1/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout + WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout) + endif () configure_file( "${CMake_SOURCE_DIR}/Tests/CTestTestZeroTimeout/test.cmake.in" http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d10d111fba33de55ed1f6178b22c5dad200b9983 commit d10d111fba33de55ed1f6178b22c5dad200b9983 Author: Zack Galbreath AuthorDate: Wed Sep 25 10:37:49 2013 -0400 Commit: Zack Galbreath CommitDate: Wed Sep 25 10:37:49 2013 -0400 clean up dashboard The Borland compiler does not seem to properly handle the substring signature of std::string::compare. This commit contains a workaround for this problem. This commit also changes the regular expression used to determine whether The RerunFailed test passes or fails. diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 1145b88..167d48e 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1776,7 +1776,10 @@ void cmCTestTestHandler::ExpandTestsToRunInformationForRerunFailed() for (int i = 0; i < numFiles; ++i) { std::string fileName = directory.GetFile(i); -if (fileName.compare(0, pattern.length(), pattern) != 0) +// bcc crashes if we attempt a normal substring comparison, +// hence the following workaround +std::string fileNameSubstring = fileName.substr(0, pattern.length()); +if (fileNameSubstring.compare(pattern) != 0) { continue; } diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 27b60a1..75735dd 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -2143,7 +2143,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ NAME CTestTestRerunFailed COMMAND ${CMAKE_CTEST_COMMAND} --rerun-failed) set_tests_properties(CTestTestRerunFailed PROPERTIES -PASS_REGULAR_EXPRESSION "1 tests failed out of 1" DEPENDS CTestTestTimeout +PASS_REGULAR_EXPRESSION "1/1 Test #1: TestTimeout" DEPENDS CTestTestTimeout WORKING_DIRECTORY ${CMake_BINARY_DIR}/Tests/CTestTestTimeout) configure_file( --- Summary of changes: Source/CTest/cmCTestTestHandler.cxx |5 - Tests/CMakeLists
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4322-g52369f4
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 52369f40a223797f8682717de3210975d12c90ad (commit) via 17a53c7381a324f805ad091884cd23477e633bc6 (commit) via bb024f2117bbe7e2bd2bc17f5c30dfb51a2f3033 (commit) from 432d10286bdc96c73a5740d6ef2e168f13d9a277 (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=52369f40a223797f8682717de3210975d12c90ad commit 52369f40a223797f8682717de3210975d12c90ad Merge: 432d102 17a53c7 Author: Daniele E. Domenichelli AuthorDate: Wed Sep 25 09:10:05 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 09:10:05 2013 -0400 Merge topic 'FindGTK2-targets' into next 17a53c7 FindGTK2: Do not use methods not available in older GTK2 version in tests bb024f2 FindGTK2: do not skip target creation if optional dependencies are not found http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17a53c7381a324f805ad091884cd23477e633bc6 commit 17a53c7381a324f805ad091884cd23477e633bc6 Author: Daniele E. Domenichelli AuthorDate: Wed Sep 25 15:07:30 2013 +0200 Commit: Daniele E. Domenichelli CommitDate: Wed Sep 25 15:07:30 2013 +0200 FindGTK2: Do not use methods not available in older GTK2 version in tests diff --git a/Tests/FindGTK2/atk/main.c b/Tests/FindGTK2/atk/main.c index 573a313..e25030e 100644 --- a/Tests/FindGTK2/atk/main.c +++ b/Tests/FindGTK2/atk/main.c @@ -2,8 +2,6 @@ int main(int argc, char *argv[]) { -guint major = atk_get_major_version(); -guint minor = atk_get_minor_version(); -guint micro = atk_get_micro_version(); +const gchar *name = atk_get_toolkit_name(); return 0; } diff --git a/Tests/FindGTK2/glibmm/main.cpp b/Tests/FindGTK2/glibmm/main.cpp index 973a22a..0e8cdae 100644 --- a/Tests/FindGTK2/glibmm/main.cpp +++ b/Tests/FindGTK2/glibmm/main.cpp @@ -1,84 +1,7 @@ -// Taken from https://developer.gnome.org/glibmm/unstable/thread_2thread_8cc-example.html - - -#include -#include -#include -#include -#include #include -namespace -{ -class MessageQueue -{ -public: -MessageQueue(); -~MessageQueue(); -void producer(); -void consumer(); -private: -Glib::Threads::Mutex mutex_; -Glib::Threads::Cond cond_push_; -Glib::Threads::Cond cond_pop_; -std::queue queue_; -}; -MessageQueue::MessageQueue() -{} -MessageQueue::~MessageQueue() -{} -void MessageQueue::producer() -{ -Glib::Rand rand (1234); -for(int i = 0; i < 200; ++i) -{ -{ -Glib::Threads::Mutex::Lock lock (mutex_); -while(queue_.size() >= 64) -cond_pop_.wait(mutex_); -queue_.push(i); -std::cout << '*'; -std::cout.flush(); -cond_push_.signal(); -} -if(rand.get_bool()) -continue; -Glib::usleep(rand.get_int_range(0, 10)); -} -} -void MessageQueue::consumer() -{ -Glib::Rand rand (4567); -for(;;) -{ -{ -Glib::Threads::Mutex::Lock lock (mutex_); -while(queue_.empty()) -cond_push_.wait(mutex_); -const int i = queue_.front(); -queue_.pop(); -std::cout << "\x08 \x08"; -std::cout.flush(); -cond_pop_.signal(); -if(i >= 199) -break; -} -if(rand.get_bool()) -continue; -Glib::usleep(rand.get_int_range(1, 20)); -} -} -} int main(int, char**) { Glib::init(); -MessageQueue queue; -Glib::Threads::Thread *const producer = Glib::Threads::Thread::create( -sigc::mem_fun(queue, &MessageQueue::producer)); -Glib::Threads::Thread *const consumer = Glib::Threads::Thread::create( -sigc::mem_fun(queue, &MessageQueue::consumer)); -producer->join(); -consumer->join(); -std::cout << std::endl; return 0; } diff --git a/Tests/FindGTK2/gthread/main.c b/Tests/FindGTK2/gthread/main.c index cf470ac..ce68cbd 100644 --- a/Tests/FindGTK2/gthread/main.c +++ b/Tests/FindGTK2/gthread/main.c @@ -1,13 +1,7 @@ #include -gpointer func(gpointer data) { -return NULL; -} - int main(int argc, char *argv[]) { g_thread_init(NULL); -GThread *thread = g_thread_new("thread", func, NULL); -g_thread_join(thread); return 0; } diff --git a/Tests/FindGTK2/pango/main.c b/Tests/FindGTK2/pango/main.c index 3e6ea05..ef87ce4 100644 --- a/Tests/FindGTK2/pango/main.c +++ b/Tests/FindGTK2/pango/main.c @@ -2,6 +2,6 @@ int main(int argc, char *argv[]) { -int version = pango_version(); +gboolean ret = pango_color_parse(NULL, "#ff");
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4319-g432d102
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 432d10286bdc96c73a5740d6ef2e168f13d9a277 (commit) via 951a158c8a89512f52779ea29731234fa25b90e5 (commit) via 5f8eefa301cf4e9d5b577112ad36b5c4bf23ba7e (commit) from bf7302535f6518908bb377d2694af5b4b64327b7 (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=432d10286bdc96c73a5740d6ef2e168f13d9a277 commit 432d10286bdc96c73a5740d6ef2e168f13d9a277 Merge: bf73025 951a158 Author: Brad King AuthorDate: Wed Sep 25 08:30:46 2013 -0400 Commit: Brad King CommitDate: Wed Sep 25 08:30:46 2013 -0400 Merge branch 'master' into next --- 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
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4316-gbf73025
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 bf7302535f6518908bb377d2694af5b4b64327b7 (commit) via 8bb3b3d344b6bf49bf5ba05fa90faedce72378a5 (commit) from bfab533e6a68350f65bd0ff3f516fd0935ea242c (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=bf7302535f6518908bb377d2694af5b4b64327b7 commit bf7302535f6518908bb377d2694af5b4b64327b7 Merge: bfab533 8bb3b3d Author: Brad King AuthorDate: Wed Sep 25 08:32:41 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 08:32:41 2013 -0400 Merge topic 'wince-subsystem' into next 8bb3b3d VS: Use version-specific subsystem for WinCE compiler id (#14440) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bb3b3d344b6bf49bf5ba05fa90faedce72378a5 commit 8bb3b3d344b6bf49bf5ba05fa90faedce72378a5 Author: Patrick Gansterer AuthorDate: Wed Sep 25 05:25:07 2013 +0200 Commit: Brad King CommitDate: Wed Sep 25 08:29:03 2013 -0400 VS: Use version-specific subsystem for WinCE compiler id (#14440) The subsystem must be set to WINDWOSCE for some SDKs to link an executable. Set it to 9 for VS2005 and to 8 for VS2008, since the value differs between the different Visual Studio versions. diff --git a/Modules/CMakeDetermineCompilerId.cmake b/Modules/CMakeDetermineCompilerId.cmake index ebd9ce0..8ca5334 100644 --- a/Modules/CMakeDetermineCompilerId.cmake +++ b/Modules/CMakeDetermineCompilerId.cmake @@ -133,7 +133,11 @@ Id flags: ${testflags} endif() if(CMAKE_VS_WINCE_VERSION) set(id_entrypoint "mainACRTStartup") - set(id_subsystem 9) + if("${vs_version}" VERSION_LESS 9) +set(id_subsystem 9) + else() +set(id_subsystem 8) + endif() else() set(id_subsystem 1) endif() --- Summary of changes: 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-864-g951a158
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 951a158c8a89512f52779ea29731234fa25b90e5 (commit) via ca63bb1001dea6929e194ac15921fdeb7d434dcd (commit) from 5f8eefa301cf4e9d5b577112ad36b5c4bf23ba7e (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=951a158c8a89512f52779ea29731234fa25b90e5 commit 951a158c8a89512f52779ea29731234fa25b90e5 Merge: 5f8eefa ca63bb1 Author: Brad King AuthorDate: Wed Sep 25 08:33:12 2013 -0400 Commit: CMake Topic Stage CommitDate: Wed Sep 25 08:33:12 2013 -0400 Merge topic 'hppa-bootstrap' ca63bb1 bootstrap: try better workaround for builds on Linux/HPPA --- Summary of changes: bootstrap |5 - 1 files changed, 4 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