[Cmake-commits] CMake branch, next, updated. v2.8.2-1021-g19b37e6
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 19b37e653d1e13b77e02e6f23bec87cda18d0a66 (commit)
via 42126aaf6ca83bbfbebab364a026763f62770bf7 (commit)
from a692da327906df8bb556844e846316b86eec87eb (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=19b37e653d1e13b77e02e6f23bec87cda18d0a66
commit 19b37e653d1e13b77e02e6f23bec87cda18d0a66
Merge: a692da3 42126aa
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Oct 7 10:11:54 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Oct 7 10:11:54 2010 -0400
Merge topic 'find-subversion-foreign-lang' into next
42126aa FindSubversion: Fix for German localized client (#11273)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42126aaf6ca83bbfbebab364a026763f62770bf7
commit 42126aaf6ca83bbfbebab364a026763f62770bf7
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Thu Oct 7 00:24:44 2010 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Oct 7 10:04:19 2010 -0400
FindSubversion: Fix for German localized client (#11273)
On a Win32 system with a German version of SilkSVN I couldn't run CMake
again on the working copy as the cache is displayed as corrupted. The
cause is that the regular expression to find the version number will not
match and put everything from the svn --version output into the cache,
which contains umlauts and other funny characters.
Fix the regexp to not only match version but also Version as
it's in the German output. I have no idea what will happen on a French
or Japanese system. This should be easy to test as it happens also on a
German Linux system.
diff --git a/Modules/FindSubversion.cmake b/Modules/FindSubversion.cmake
index daf3d87..61e0253 100644
--- a/Modules/FindSubversion.cmake
+++ b/Modules/FindSubversion.cmake
@@ -57,7 +57,7 @@ IF(Subversion_SVN_EXECUTABLE)
OUTPUT_VARIABLE Subversion_VERSION_SVN
OUTPUT_STRIP_TRAILING_WHITESPACE)
- STRING(REGEX REPLACE ^(.*\n)?svn, version ([.0-9]+).*
+ STRING(REGEX REPLACE ^(.*\n)?svn, [Vv]ersion ([.0-9]+).*
\\2 Subversion_VERSION_SVN ${Subversion_VERSION_SVN})
MACRO(Subversion_WC_INFO dir prefix)
---
Summary of changes:
Modules/FindSubversion.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-1023-gd99c2b9
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 d99c2b95dcc5e8c5234312121dfa0a699bb3c30d (commit)
via 973df7c0e94f0bbc0403c6e2038363a75bb81bca (commit)
from 19b37e653d1e13b77e02e6f23bec87cda18d0a66 (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=d99c2b95dcc5e8c5234312121dfa0a699bb3c30d
commit d99c2b95dcc5e8c5234312121dfa0a699bb3c30d
Merge: 19b37e6 973df7c
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Oct 7 10:14:16 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Oct 7 10:14:16 2010 -0400
Merge topic 'vs10-order-dependencies' into next
973df7c VS10: Order .vcxproj dependencies deterministically (#10502)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=973df7c0e94f0bbc0403c6e2038363a75bb81bca
commit 973df7c0e94f0bbc0403c6e2038363a75bb81bca
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Oct 7 09:54:24 2010 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Oct 7 09:54:24 2010 -0400
VS10: Order .vcxproj dependencies deterministically (#10502)
This avoids needless modification of the project files during
regeneration.
diff --git a/Source/cmGlobalVisualStudioGenerator.h
b/Source/cmGlobalVisualStudioGenerator.h
index daa6b3a..c8ea339 100644
--- a/Source/cmGlobalVisualStudioGenerator.h
+++ b/Source/cmGlobalVisualStudioGenerator.h
@@ -69,14 +69,6 @@ public:
i.e. Can I build Debug and Release in the same tree? */
virtual bool IsMultiConfig() { return true; }
-protected:
- // Does this VS version link targets to each other if there are
- // dependencies in the SLN file? This was done for VS versions
- // below 8.
- virtual bool VSLinksDependencies() const { return true; }
-
- virtual const char* GetIDEVersion() = 0;
-
struct TargetCompare
{
bool operator()(cmTarget const* l, cmTarget const* r) const;
@@ -87,6 +79,14 @@ protected:
OrderedTargetDependSet(cmGlobalGenerator::TargetDependSet const);
};
+protected:
+ // Does this VS version link targets to each other if there are
+ // dependencies in the SLN file? This was done for VS versions
+ // below 8.
+ virtual bool VSLinksDependencies() const { return true; }
+
+ virtual const char* GetIDEVersion() = 0;
+
virtual bool ComputeTargetDepends();
class VSDependSet: public std::setcmStdString {};
class VSDependMap: public std::mapcmTarget*, VSDependSet {};
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx
b/Source/cmVisualStudio10TargetGenerator.cxx
index 9c0364b..524be8b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1479,10 +1479,13 @@ void cmVisualStudio10TargetGenerator::WriteEvent(
void cmVisualStudio10TargetGenerator::WriteProjectReferences()
{
- cmGlobalGenerator::TargetDependSet const depends
+ cmGlobalGenerator::TargetDependSet const unordered
= this-GlobalGenerator-GetTargetDirectDepends(*this-Target);
+ typedef cmGlobalVisualStudioGenerator::OrderedTargetDependSet
+OrderedTargetDependSet;
+ OrderedTargetDependSet depends(unordered);
this-WriteString(ItemGroup\n, 1);
- for( cmGlobalGenerator::TargetDependSet::const_iterator i = depends.begin();
+ for( OrderedTargetDependSet::const_iterator i = depends.begin();
i != depends.end(); ++i)
{
cmTarget* dt = *i;
---
Summary of changes:
Source/cmGlobalVisualStudioGenerator.h | 16
Source/cmVisualStudio10TargetGenerator.cxx |7 +--
2 files changed, 13 insertions(+), 10 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-1027-g7143d44
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 7143d44ef520df02e33ef23ceb57a3f4e99dbfb6 (commit)
via d4ee998b61cf3c16e9e04da2173490589790a894 (commit)
from 8d5237e469b64faa37c69ef889ee23a46aa18f58 (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=7143d44ef520df02e33ef23ceb57a3f4e99dbfb6
commit 7143d44ef520df02e33ef23ceb57a3f4e99dbfb6
Merge: 8d5237e d4ee998
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Oct 7 12:24:41 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Oct 7 12:24:41 2010 -0400
Merge topic 'dev/strict-mode' into next
d4ee998 Hard-code the --no-warn-unused-cli flag
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d4ee998b61cf3c16e9e04da2173490589790a894
commit d4ee998b61cf3c16e9e04da2173490589790a894
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Oct 7 12:22:00 2010 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Oct 7 12:22:00 2010 -0400
Hard-code the --no-warn-unused-cli flag
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index a4a79be..ed34569 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2810,7 +2810,11 @@ int cmMakefile::TryCompile(const char *srcdir, const
char *bindir,
// if cmake args were provided then pass them in
if (cmakeArgs)
{
-cm.SetArgs(*cmakeArgs, true);
+// FIXME: Workaround to ignore unused CLI variables until the
+// 'ArgumentExpansion' test succeeds with CMAKE_STRICT on
+cm.SetWarnUnusedCli(true);
+//cm.SetArgs(*cmakeArgs, true);
+
cm.SetCacheArgs(*cmakeArgs);
}
// to save time we pass the EnableLanguage info directly
---
Summary of changes:
Source/cmMakefile.cxx |6 +-
1 files changed, 5 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-1029-g0fe364f
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 0fe364f8aa695630ab52dc5e07da186cc8b3ada2 (commit)
via 8dbb2090a2fac15f61710afef9887e224c1c7f72 (commit)
from 7143d44ef520df02e33ef23ceb57a3f4e99dbfb6 (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=0fe364f8aa695630ab52dc5e07da186cc8b3ada2
commit 0fe364f8aa695630ab52dc5e07da186cc8b3ada2
Merge: 7143d44 8dbb209
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Oct 7 12:29:10 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Oct 7 12:29:10 2010 -0400
Merge topic 'dev/strict-mode' into next
8dbb209 Wrong boolean value for CLI warnings
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8dbb2090a2fac15f61710afef9887e224c1c7f72
commit 8dbb2090a2fac15f61710afef9887e224c1c7f72
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Oct 7 12:28:25 2010 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Oct 7 12:28:25 2010 -0400
Wrong boolean value for CLI warnings
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index ed34569..15c5370 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2812,7 +2812,7 @@ int cmMakefile::TryCompile(const char *srcdir, const char
*bindir,
{
// FIXME: Workaround to ignore unused CLI variables until the
// 'ArgumentExpansion' test succeeds with CMAKE_STRICT on
-cm.SetWarnUnusedCli(true);
+cm.SetWarnUnusedCli(false);
//cm.SetArgs(*cmakeArgs, true);
cm.SetCacheArgs(*cmakeArgs);
---
Summary of changes:
Source/cmMakefile.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-1031-g94ed8db
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 94ed8dbe202db1ee68be2e768cbba2a97b8f755a (commit)
via fe390a2607afcd8f0985a54990236a3ea16643ab (commit)
from 0fe364f8aa695630ab52dc5e07da186cc8b3ada2 (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=94ed8dbe202db1ee68be2e768cbba2a97b8f755a
commit 94ed8dbe202db1ee68be2e768cbba2a97b8f755a
Merge: 0fe364f fe390a2
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Oct 7 13:02:18 2010 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Oct 7 13:02:18 2010 -0400
Merge topic 'dev/strict-mode' into next
fe390a2 Add 'ArgumentExpansion' test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe390a2607afcd8f0985a54990236a3ea16643ab
commit fe390a2607afcd8f0985a54990236a3ea16643ab
Author: Ben Boeckel ben.boec...@kitware.com
AuthorDate: Thu Oct 7 12:29:43 2010 -0400
Commit: Ben Boeckel ben.boec...@kitware.com
CommitDate: Thu Oct 7 13:01:32 2010 -0400
Add 'ArgumentExpansion' test
diff --git a/Tests/ArgumentExpansion/CMakeLists.txt
b/Tests/ArgumentExpansion/CMakeLists.txt
new file mode 100644
index 000..bd78169
--- /dev/null
+++ b/Tests/ArgumentExpansion/CMakeLists.txt
@@ -0,0 +1,59 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(ArgumentExpansion)
+
+function (argument_tester expected expected_len)
+list(LENGTH ARGN argn_len)
+list(LENGTH ${expected} expected_received_len)
+
+if (NOT ${expected_received_len} EQUAL ${expected_len})
+message(STATUS Error: Expanding expected values isn't working)
+endif (NOT ${expected_received_len} EQUAL ${expected_len})
+
+if (${argn_len} EQUAL ${expected_len})
+set(i 0)
+while (i LESS ${argn_len})
+list(GET ARGN ${i} argn_value)
+list(GET ${expected} ${i} expected_value)
+
+if (NOT ${argn_value} STREQUAL ${expected_value})
+message(STATUS Error: Argument ${i} doesn't match)
+message(STATUS Expected: ${expected_value})
+message(STATUS Received: ${argn_value})
+endif (NOT ${argn_value} STREQUAL ${expected_value})
+
+math(EXPR i ${i} + 1)
+endwhile (i LESS ${argn_len})
+else (${argn_len} EQUAL ${expected_len})
+message(STATUS Error: Lengths of arguments don't match)
+message(STATUS Expected: ${expected_len})
+message(STATUS Received: ${argn_len})
+endif (${argn_len} EQUAL ${expected_len})
+endfunction (argument_tester expected)
+
+set(empty_test)
+message(STATUS Test: Empty arguments)
+argument_tester(empty_test 0 ${empty_test})
+
+set(single_arg_test
+single arg)
+message(STATUS Test: Single argument)
+argument_tester(single_arg_test 1 ${single_arg_test})
+
+set(multiple_arg_test
+first arg
+second arg)
+message(STATUS Test: Multiple arguments)
+argument_tester(multiple_arg_test 2 ${multiple_arg_test})
+
+set(nested_list_arg_test
+${multiple_arg_test}
+first arg
+second arg)
+message(STATUS Test: Nested list argument)
+argument_tester(nested_list_arg_test 3 ${nested_list_arg_test})
+
+set(semicolon_arg_test
+pre\;post)
+message(STATUS Test: Semicolon argument)
+argument_tester(semicolon_arg_test 1 ${semicolon_arg_test})
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 739dcdf..a725354 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -368,6 +368,21 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P
${CMake_SOURCE_DIR}/Utilities/
)
LIST(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/CustComDepend)
+ ADD_TEST(ArgumentExpansion ${CMAKE_CTEST_COMMAND}
+--build-and-test
+${CMake_SOURCE_DIR}/Tests/ArgumentExpansion
+${CMake_BINARY_DIR}/Tests/ArgumentExpansion
+--build-generator ${CMAKE_TEST_GENERATOR}
+--build-project ArgumentExpansion
+--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+--build-exe-dir ${CMake_BINARY_DIR}/Tests/ArgumentExpansion/bin
+)
+ IF(CMAKE_STRICT)
+SET_TESTS_PROPERTIES(ArgumentExpansion PROPERTIES
+ FAIL_REGULAR_EXPRESSION Error: )
+ ENDIF(CMAKE_STRICT)
+ LIST(APPEND TEST_BUILD_DIRS ${CMake_BINARY_DIR}/Tests/ArgumentExpansion)
+
ADD_TEST(CustomCommand ${CMAKE_CTEST_COMMAND}
--build-and-test
${CMake_SOURCE_DIR}/Tests/CustomCommand
---
Summary of changes:
Tests/ArgumentExpansion/CMakeLists.txt | 59
Tests/CMakeLists.txt | 15
2 files changed, 74 insertions(+), 0 deletions(-)
create
