[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3148-g591e204

Stephen Kelly steveire at gmail.com
Tue Jul 16 05:48:22 EDT 2013


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  591e2043dbeb45e61bbde2d8b0d8763ef1deda9e (commit)
       via  8ae47b6f70e3e7d68e8372088759db619fb7e10d (commit)
      from  0b9d3bf2f02f43bcbb563acf13370a27a34fb6db (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=591e2043dbeb45e61bbde2d8b0d8763ef1deda9e
commit 591e2043dbeb45e61bbde2d8b0d8763ef1deda9e
Merge: 0b9d3bf 8ae47b6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 16 05:48:12 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 16 05:48:12 2013 -0400

    Merge topic 'compile-defs-debugging' into next
    
    8ae47b6 Fix determination of VS70 generator.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ae47b6f70e3e7d68e8372088759db619fb7e10d
commit 8ae47b6f70e3e7d68e8372088759db619fb7e10d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 16 11:47:24 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Jul 16 11:47:24 2013 +0200

    Fix determination of VS70 generator.

diff --git a/Tests/CompileDefinitions/CMakeLists.txt b/Tests/CompileDefinitions/CMakeLists.txt
index 21527b4..3e1d4e7 100644
--- a/Tests/CompileDefinitions/CMakeLists.txt
+++ b/Tests/CompileDefinitions/CMakeLists.txt
@@ -25,7 +25,7 @@ add_subdirectory(add_definitions_command_with_target_prop)
 
 add_executable(CompileDefinitions runtest.c)
 
-if(NOT BORLAND AND NOT PP_VS70)
+if(NOT BORLAND AND NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio 7$")
   # Borland, VS70 IDE: ;
   # The Borland compiler will simply not accept a non-escaped semicolon
   # on the command line.  If it is escaped \; then the escape character

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list