[Cmake-commits] CMake branch, next, updated. v2.8.3-1494-g05f0bb8

[Alexander Neundorf]

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  05f0bb86b188aa3381fed65e0f6eb128de9fde0d (commit)
       via  ccbdc24ae1d6bc5f7105b4bd242b75b11fd50de9 (commit)
      from  240c3e2c18f984b4839d80befde35802592684a2 (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=05f0bb86b188aa3381fed65e0f6eb128de9fde0d
commit 05f0bb86b188aa3381fed65e0f6eb128de9fde0d
Merge: 240c3e2 ccbdc24
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Wed Jan 26 15:55:59 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 26 15:55:59 2011 -0500

    Merge topic 'MakeCMakeBuildWithCMakeLess263' into next
    
    ccbdc24 Make cmake build again with cmake < 2.6.3


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ccbdc24ae1d6bc5f7105b4bd242b75b11fd50de9
commit ccbdc24ae1d6bc5f7105b4bd242b75b11fd50de9
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Wed Jan 26 21:52:22 2011 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Wed Jan 26 21:52:22 2011 +0100

    Make cmake build again with cmake < 2.6.3
    
    cmake_minimum_required() still says 2.4.5, but in Tests/CMakeLists.txt
    there was a parenthesis expression, which is new since 2.6.3.
    
    Alex

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index adef084..4a9c043 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -138,8 +138,8 @@ IF(BUILD_TESTING)
     SET(TEST_RESOURCES TRUE)
   ENDIF()
   # for borland and watcom there is no resource support
-  IF(("${CMAKE_TEST_GENERATOR}" MATCHES "WMake") OR
-      ("${CMAKE_TEST_GENERATOR}" MATCHES "Borland"))
+  IF("${CMAKE_TEST_GENERATOR}" MATCHES "WMake" OR
+      "${CMAKE_TEST_GENERATOR}" MATCHES "Borland")
     SET(TEST_RESOURCES FALSE)
   ENDIF()
   IF(TEST_RESOURCES)

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake