[Cmake-commits] CMake branch, next, updated. v2.8.9-937-g6f372f4
Rolf Eike Beer
eike at sf-mail.de
Mon Oct 1 12:10:12 EDT 2012
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 6f372f4649a90fd41a4fc50552151e899a9ff278 (commit)
via a221f52a2a2a82f5b2bf5ba82e4d86d278d1b2c3 (commit)
via d54359bceb06a57edac20c9e0d45a0403f2a66e8 (commit)
from 8c905e107794249eeb8cd07a75ffe9b4276e239b (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=6f372f4649a90fd41a4fc50552151e899a9ff278
commit 6f372f4649a90fd41a4fc50552151e899a9ff278
Merge: 8c905e1 a221f52
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 1 12:10:10 2012 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 1 12:10:10 2012 -0400
Merge topic 'test-ctest-memcheck' into next
a221f52 require CMake/CTest 2.8.9 for the tests, fixes e.g. Cygwin warnings
d54359b fix usage of empty variable
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a221f52a2a2a82f5b2bf5ba82e4d86d278d1b2c3
commit a221f52a2a2a82f5b2bf5ba82e4d86d278d1b2c3
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 1 18:09:52 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Oct 1 18:09:52 2012 +0200
require CMake/CTest 2.8.9 for the tests, fixes e.g. Cygwin warnings
diff --git a/Tests/CTestTestMemcheck/DummyBC/CMakeLists.txt b/Tests/CTestTestMemcheck/DummyBC/CMakeLists.txt
index ed8ee6b..aa0e495 100644
--- a/Tests/CTestTestMemcheck/DummyBC/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/DummyBC/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckDummyBC)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/DummyBC/test.cmake.in b/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
index eb1d773..ae8f33b 100644
--- a/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyBC/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/Tests/CTestTestMemcheck/DummyPurify/CMakeLists.txt b/Tests/CTestTestMemcheck/DummyPurify/CMakeLists.txt
index 7ef96d4..dfd93fd 100644
--- a/Tests/CTestTestMemcheck/DummyPurify/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/DummyPurify/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckDummyPurify)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in b/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
index 4eaea4c..74ce1e1 100644
--- a/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyPurify/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/Tests/CTestTestMemcheck/DummyValgrind/CMakeLists.txt b/Tests/CTestTestMemcheck/DummyValgrind/CMakeLists.txt
index a84153c..822966a 100644
--- a/Tests/CTestTestMemcheck/DummyValgrind/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/DummyValgrind/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckDummyValgrind)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
index 3a24ba6..40c9233 100644
--- a/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrind/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/Tests/CTestTestMemcheck/DummyValgrindFailPost/CMakeLists.txt b/Tests/CTestTestMemcheck/DummyValgrindFailPost/CMakeLists.txt
index 1b8dc77..8185071 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindFailPost/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/DummyValgrindFailPost/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckDummyValgrindFailPost)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
index 8c2895d..a4a2915 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindFailPost/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/Tests/CTestTestMemcheck/DummyValgrindFailPre/CMakeLists.txt b/Tests/CTestTestMemcheck/DummyValgrindFailPre/CMakeLists.txt
index 6e6ab82..3714cd6 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindFailPre/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/DummyValgrindFailPre/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckDummyValgrindFailPre)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
index 5cd1a53..2c5e8f7 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindFailPre/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CMakeLists.txt
index eae9910..5d437d1 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckDummyValgrindIgnoreMemcheck)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/test.cmake.in
index caf003d..a2b14a0 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindIgnoreMemcheck/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/Tests/CTestTestMemcheck/DummyValgrindPrePost/CMakeLists.txt b/Tests/CTestTestMemcheck/DummyValgrindPrePost/CMakeLists.txt
index 83049e4..bc15632 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindPrePost/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/DummyValgrindPrePost/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckDummyValgrindPrePost)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in b/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
index f404727..e2486b8 100644
--- a/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
+++ b/Tests/CTestTestMemcheck/DummyValgrindPrePost/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/Tests/CTestTestMemcheck/NotExist/CMakeLists.txt b/Tests/CTestTestMemcheck/NotExist/CMakeLists.txt
index 879f705..4d905de 100644
--- a/Tests/CTestTestMemcheck/NotExist/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/NotExist/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckNotExist)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/NotExist/test.cmake.in b/Tests/CTestTestMemcheck/NotExist/test.cmake.in
index 7c0bc54..78db7e2 100644
--- a/Tests/CTestTestMemcheck/NotExist/test.cmake.in
+++ b/Tests/CTestTestMemcheck/NotExist/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
diff --git a/Tests/CTestTestMemcheck/Unknown/CMakeLists.txt b/Tests/CTestTestMemcheck/Unknown/CMakeLists.txt
index 67c4150..3fd3103 100644
--- a/Tests/CTestTestMemcheck/Unknown/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/Unknown/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.9)
project(CTestTestMemcheckUnknown)
include(CTest)
diff --git a/Tests/CTestTestMemcheck/Unknown/test.cmake.in b/Tests/CTestTestMemcheck/Unknown/test.cmake.in
index b4dbfce..c0b7839 100644
--- a/Tests/CTestTestMemcheck/Unknown/test.cmake.in
+++ b/Tests/CTestTestMemcheck/Unknown/test.cmake.in
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.1)
+cmake_minimum_required(VERSION 2.8.9)
# Settings:
set(CTEST_DASHBOARD_ROOT "@CMAKE_CURRENT_BINARY_DIR@")
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d54359bceb06a57edac20c9e0d45a0403f2a66e8
commit d54359bceb06a57edac20c9e0d45a0403f2a66e8
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Mon Oct 1 18:09:26 2012 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Mon Oct 1 18:09:26 2012 +0200
fix usage of empty variable
diff --git a/Tests/CTestTestMemcheck/CMakeLists.txt b/Tests/CTestTestMemcheck/CMakeLists.txt
index 17465b5..dd61a9b 100644
--- a/Tests/CTestTestMemcheck/CMakeLists.txt
+++ b/Tests/CTestTestMemcheck/CMakeLists.txt
@@ -31,12 +31,12 @@ foreach (_test IN ITEMS Unknown NotExist DummyValgrind DummyValgrindPrePost
)
endforeach ()
-string(REPLACE "\\" "\\\\" CMAKE_COMMAND_NATIVE "${CMAKE_COMMAND_NATIVE}")
-string(REPLACE "(" "\\(" CMAKE_COMMAND_NATIVE "${CMAKE_COMMAND_NATIVE}")
-string(REPLACE ")" "\\)" CMAKE_COMMAND_NATIVE "${CMAKE_COMMAND_NATIVE}")
-string(REPLACE "+" "\\+" CMAKE_COMMAND_NATIVE "${CMAKE_COMMAND_NATIVE}")
+string(REPLACE "\\" "\\\\" CMAKE_COMMAND_ESCAPED "${CMAKE_COMMAND}")
+string(REPLACE "(" "\\(" CMAKE_COMMAND_ESCAPED "${CMAKE_COMMAND_ESCAPED}")
+string(REPLACE ")" "\\)" CMAKE_COMMAND_ESCAPED "${CMAKE_COMMAND_ESCAPED}")
+string(REPLACE "+" "\\+" CMAKE_COMMAND_ESCAPED "${CMAKE_COMMAND_ESCAPED}")
set_tests_properties(CTestTestMemcheckUnknown PROPERTIES
- PASS_REGULAR_EXPRESSION "Do not understand memory checker: ${CMAKE_COMMAND_NATIVE}\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/Unknown/test.cmake\n")
+ PASS_REGULAR_EXPRESSION "Do not understand memory checker: ${CMAKE_COMMAND_ESCAPED}\n(.*\n)?Error in read script: ${CMAKE_CURRENT_BINARY_DIR}/Unknown/test.cmake\n")
set_tests_properties(CTestTestMemcheckNotExist PROPERTIES
PASS_REGULAR_EXPRESSION "Memory checker \\(MemoryCheckCommand\\) not set, or cannot find the specified program.")
-----------------------------------------------------------------------
Summary of changes:
Tests/CTestTestMemcheck/CMakeLists.txt | 10 +++++-----
Tests/CTestTestMemcheck/DummyBC/CMakeLists.txt | 2 +-
Tests/CTestTestMemcheck/DummyBC/test.cmake.in | 2 +-
Tests/CTestTestMemcheck/DummyPurify/CMakeLists.txt | 2 +-
Tests/CTestTestMemcheck/DummyPurify/test.cmake.in | 2 +-
.../CTestTestMemcheck/DummyValgrind/CMakeLists.txt | 2 +-
.../CTestTestMemcheck/DummyValgrind/test.cmake.in | 2 +-
.../DummyValgrindFailPost/CMakeLists.txt | 2 +-
.../DummyValgrindFailPost/test.cmake.in | 2 +-
.../DummyValgrindFailPre/CMakeLists.txt | 2 +-
.../DummyValgrindFailPre/test.cmake.in | 2 +-
.../DummyValgrindIgnoreMemcheck/CMakeLists.txt | 2 +-
.../DummyValgrindIgnoreMemcheck/test.cmake.in | 2 +-
.../DummyValgrindPrePost/CMakeLists.txt | 2 +-
.../DummyValgrindPrePost/test.cmake.in | 2 +-
Tests/CTestTestMemcheck/NotExist/CMakeLists.txt | 2 +-
Tests/CTestTestMemcheck/NotExist/test.cmake.in | 2 +-
Tests/CTestTestMemcheck/Unknown/CMakeLists.txt | 2 +-
Tests/CTestTestMemcheck/Unknown/test.cmake.in | 2 +-
19 files changed, 23 insertions(+), 23 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list