[Cmake-commits] CMake branch, master, updated. v2.8.11.2-855-gd2cf4e9
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 d2cf4e990c3c9abc3b2036dfb78771c4eda2abe8 (commit) via 0f05961f03b2735b32e9da54b32287fb3631e76b (commit) from 45b182180c4203c909a31bee5da7c8bf713fbb14 (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=d2cf4e990c3c9abc3b2036dfb78771c4eda2abe8 commit d2cf4e990c3c9abc3b2036dfb78771c4eda2abe8 Merge: 45b1821 0f05961 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Sep 20 08:10:22 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Sep 20 08:10:22 2013 -0400 Merge topic 'FindHDF5-fix-lib-selection' 0f05961 FindHDF5: Fix regression in per-configuration library selection --- Summary of changes: Modules/FindHDF5.cmake | 38 ++ 1 files changed, 2 insertions(+), 36 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-4257-g1824e60
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 1824e60717c7c679a56623957291f1de2190b5ee (commit) via d2cf4e990c3c9abc3b2036dfb78771c4eda2abe8 (commit) via 45b182180c4203c909a31bee5da7c8bf713fbb14 (commit) from 49f428046ce0ba1a2729afe0b2d1045e765aaccc (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=1824e60717c7c679a56623957291f1de2190b5ee commit 1824e60717c7c679a56623957291f1de2190b5ee Merge: 49f4280 d2cf4e9 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Sep 20 08:09:25 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Sep 20 08:09:25 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-4263-g3fbf948
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 3fbf9485b8fa7786f36da56a86801bf4385457f1 (commit)
via 6a47c37ccf7049d5ac3fa6224def8d17ee82c7f5 (commit)
via d331292c121269ccfceee302a0f9bbb960b9f02d (commit)
via 6fe5c4afc0a8363927ecd48bea4cc822894f97db (commit)
from f8c114ea5689f2efd3aa59a29a891210009e6537 (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=3fbf9485b8fa7786f36da56a86801bf4385457f1
commit 3fbf9485b8fa7786f36da56a86801bf4385457f1
Merge: f8c114e 6a47c37
Author: Brad King brad.k...@kitware.com
AuthorDate: Fri Sep 20 08:21:27 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Sep 20 08:21:27 2013 -0400
Merge topic 'test-property-genex' into next
6a47c37 add_test: Mention generator expressions in old-style add_test docs
d331292 cmTestGenerator: Evaluate generator expressions in test properties
6fe5c4a cmTestGenerator: Separate test properties for each configuration
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a47c37ccf7049d5ac3fa6224def8d17ee82c7f5
commit 6a47c37ccf7049d5ac3fa6224def8d17ee82c7f5
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Wed Aug 7 18:08:54 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Sep 20 08:18:22 2013 -0400
add_test: Mention generator expressions in old-style add_test docs
The old-style add_test() call does not support generator expressions at
all. This also applies to the properties for the test, but it is not
mentioned at all.
diff --git a/Source/cmAddTestCommand.h b/Source/cmAddTestCommand.h
index ec7fda3..ce98aaa 100644
--- a/Source/cmAddTestCommand.h
+++ b/Source/cmAddTestCommand.h
@@ -66,7 +66,8 @@ public:
built by this project or an arbitrary executable on the
system (like tclsh). The test will be run with the current working
directory set to the CMakeList.txt files corresponding directory
- in the binary tree.\n
+ in the binary tree. Tests added using this signature do not support
+ generator expressions.\n
\n
add_test(NAME name [CONFIGURATIONS [Debug|Release|...]]\n
[WORKING_DIRECTORY dir]\n
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d331292c121269ccfceee302a0f9bbb960b9f02d
commit d331292c121269ccfceee302a0f9bbb960b9f02d
Author: Ben Boeckel maths...@gmail.com
AuthorDate: Wed Aug 7 17:07:30 2013 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Fri Sep 20 08:18:22 2013 -0400
cmTestGenerator: Evaluate generator expressions in test properties
This is useful for cases like:
add_test(NAME mytest COMMAND mydriver $TARGET_FILE:myexe)
set_tests_properties(mytest PROPERTIES
REQUIRED_FILES $TARGET_FILE:myexe
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$CONFIGURATION
)
In this example we require the actual test executable to exist to
run the test in addition to the test driver at argv[0]. Also the
$CONFIGURATION expression improves over \${CTEST_CONFIGURATION_TYPE}
because the latter is not normalized for case-sensitive filesystems.
diff --git a/Source/cmSetTestsPropertiesCommand.h
b/Source/cmSetTestsPropertiesCommand.h
index 3a59218..f2f2611 100644
--- a/Source/cmSetTestsPropertiesCommand.h
+++ b/Source/cmSetTestsPropertiesCommand.h
@@ -51,7 +51,8 @@ public:
set_tests_properties(test1 [test2...] PROPERTIES prop1 value1 prop2
value2)\n
Set a property for the tests. If the property is not found, CMake
- will report an error. The properties include:\n
+ will report an error. Generator expressions will be expanded the same
+ as supported by the test's add_test call. The properties include:\n
WILL_FAIL: If set to true, this will invert the pass/fail flag of the
test.\n
PASS_REGULAR_EXPRESSION: If set, the test output will be checked
diff --git a/Source/cmTestGenerator.cxx b/Source/cmTestGenerator.cxx
index 3167362..e5984a8 100644
--- a/Source/cmTestGenerator.cxx
+++ b/Source/cmTestGenerator.cxx
@@ -117,7 +117,8 @@ void cmTestGenerator::GenerateScriptForConfig(std::ostream
os,
i != pm.end(); ++i)
{
os i-first
- lg-EscapeForCMake(i-second.GetValue());
+ lg-EscapeForCMake(
+ ge.Parse(i-second.GetValue())-Evaluate(mf, config));
}
os ) std::endl;
}
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 9c3ed59..a5ad58c 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -604,6 +604,7 @@
[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4265-g5081283
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 50812834abca50370338b8a86bdcf956406ad370 (commit) via 027a0201b270e582d76c1de94a60c19a2a8e505c (commit) from 3fbf9485b8fa7786f36da56a86801bf4385457f1 (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=50812834abca50370338b8a86bdcf956406ad370 commit 50812834abca50370338b8a86bdcf956406ad370 Merge: 3fbf948 027a020 Author: Brad King brad.k...@kitware.com AuthorDate: Fri Sep 20 08:23:04 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Fri Sep 20 08:23:04 2013 -0400 Merge topic 'generate-modern-style' into next 027a020 Merge branch 'test-property-genex' into generate-modern-style http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=027a0201b270e582d76c1de94a60c19a2a8e505c commit 027a0201b270e582d76c1de94a60c19a2a8e505c Merge: 33055c4 6a47c37 Author: Brad King brad.k...@kitware.com AuthorDate: Wed Sep 18 14:05:30 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Fri Sep 20 08:20:01 2013 -0400 Merge branch 'test-property-genex' into generate-modern-style Resolve conflict in Source/cmTestGenerator.cxx by taking their side (test-property-genex). It already accounts for the lower-case change in our side (generate-modern-style). --- 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, next, updated. v2.8.11.2-4267-gfb9821f
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 fb9821f70dd959c377458ac15a0f9a8e35321c73 (commit)
via 4cc5c46ba26682dba9c800fe0963be2fab5a5734 (commit)
from 50812834abca50370338b8a86bdcf956406ad370 (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=fb9821f70dd959c377458ac15a0f9a8e35321c73
commit fb9821f70dd959c377458ac15a0f9a8e35321c73
Merge: 5081283 4cc5c46
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Fri Sep 20 17:53:21 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Fri Sep 20 17:53:21 2013 -0400
Merge topic 'add_cache_options_to_ccmake' into next
4cc5c46 Teach ccmake to understand cache option strings.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cc5c46ba26682dba9c800fe0963be2fab5a5734
commit 4cc5c46ba26682dba9c800fe0963be2fab5a5734
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Fri Sep 20 17:47:38 2013 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Fri Sep 20 17:47:38 2013 -0400
Teach ccmake to understand cache option strings.
This commit adds the ability to ccmake of cycling through cache options.
This uses the STRINGS property of the cache entry. The enter key will cycle
forward, and the right and left arrows will go up and down in the list.
diff --git a/Source/CursesDialog/CMakeLists.txt
b/Source/CursesDialog/CMakeLists.txt
index 5efc2fb..548f5a5 100644
--- a/Source/CursesDialog/CMakeLists.txt
+++ b/Source/CursesDialog/CMakeLists.txt
@@ -11,6 +11,7 @@
#=
set( CURSES_SRCS
+ CursesDialog/cmCursesOptionsWidget
CursesDialog/cmCursesBoolWidget
CursesDialog/cmCursesCacheEntryComposite
CursesDialog/cmCursesDummyWidget
diff --git a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
index c58d037..249137f 100644
--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@@ -10,6 +10,7 @@
See the License for more information.
*/
#include cmCursesCacheEntryComposite.h
+#include cmCursesOptionsWidget.h
#include cmCursesStringWidget.h
#include cmCursesLabelWidget.h
#include cmCursesBoolWidget.h
@@ -69,9 +70,27 @@ cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
it.GetValue());
break;
case cmCacheManager::STRING:
- this-Entry = new cmCursesStringWidget(this-EntryWidth, 1, 1, 1);
- static_castcmCursesStringWidget*(this-Entry)-SetString(
-it.GetValue());
+ if(it.PropertyExists(STRINGS))
+{
+cmCursesOptionsWidget* ow =
+ new cmCursesOptionsWidget(this-EntryWidth, 1, 1, 1);
+this-Entry = ow;
+std::vectorstd::string options;
+cmSystemTools::ExpandListArgument(
+ std::string(it.GetProperty(STRINGS)), options);
+for(std::vectorstd::string::iterator
+ si = options.begin(); si != options.end(); ++si)
+ {
+ ow-AddOption(*si);
+ }
+ow-SetOption(it.GetValue());
+}
+ else
+{
+this-Entry = new cmCursesStringWidget(this-EntryWidth, 1, 1, 1);
+static_castcmCursesStringWidget*(this-Entry)-SetString(
+ it.GetValue());
+}
break;
case cmCacheManager::UNINITIALIZED:
cmSystemTools::Error(Found an undefined variable: , it.GetName());
diff --git a/Source/CursesDialog/cmCursesOptionsWidget.cxx
b/Source/CursesDialog/cmCursesOptionsWidget.cxx
new file mode 100644
index 000..652b2df
--- /dev/null
+++ b/Source/CursesDialog/cmCursesOptionsWidget.cxx
@@ -0,0 +1,106 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+
+ 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.
+*/
+#include cmCursesOptionsWidget.h
+#include cmCursesMainForm.h
+
+inline int ctrl(int z)
+{
+return (z037);
+}
+
+cmCursesOptionsWidget::cmCursesOptionsWidget(int width, int height,
+
