[Cmake-commits] CMake branch, master, updated. v2.8.9-161-g05784da

David Cole david.cole at kitware.com
Fri Aug 24 14:24:26 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, master has been updated
       via  05784dadc59ee3c87ab6140d684ff4c602de9ec1 (commit)
       via  f0a1065393a57f503bc2c86f432f50dd4b8d5bbd (commit)
       via  ca7fb14f9b966805cb11fdf71648337b71c1047b (commit)
       via  733deb66c63dbbd8caa84f7630318c6f76da2d9f (commit)
       via  3dae652b4ea8e039dd9f4d845497ec988fbbe82c (commit)
      from  286f7c9644d1fb8ac8b5d46e2a3c9c393680acef (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=05784dadc59ee3c87ab6140d684ff4c602de9ec1
commit 05784dadc59ee3c87ab6140d684ff4c602de9ec1
Merge: 286f7c9 f0a1065
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 24 14:24:24 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 24 14:24:24 2012 -0400

    Merge topic 'compile-definitions-unique'
    
    f0a1065 Rename files from main.cpp to more meaningful names.
    ca7fb14 Fix the test setting COMPILE_DEFINITIONS target property
    733deb6 Fix CompileDefinitions test on Visual Studio.
    3dae652 Don't duplicate -D defines sent to the compiler.


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

Summary of changes:
 Source/cmLocalGenerator.cxx                        |   61 +++++++------
 Source/cmLocalGenerator.h                          |   10 ++-
 Source/cmLocalVisualStudio6Generator.cxx           |   92 +++++++++++++-------
 Source/cmMakefileTargetGenerator.cxx               |   34 +++++---
 Source/cmNinjaTargetGenerator.cxx                  |   29 +++----
 Tests/CMakeLists.txt                               |    1 +
 Tests/CompileDefinitions/CMakeLists.txt            |   16 ++++
 .../add_definitions_command/CMakeLists.txt         |    7 ++
 .../CMakeLists.txt                                 |   14 +++
 Tests/CompileDefinitions/compiletest.cpp           |   33 +++++++
 .../CompileDefinitions/target_prop/CMakeLists.txt  |    9 ++
 11 files changed, 215 insertions(+), 91 deletions(-)
 create mode 100644 Tests/CompileDefinitions/CMakeLists.txt
 create mode 100644 Tests/CompileDefinitions/add_definitions_command/CMakeLists.txt
 create mode 100644 Tests/CompileDefinitions/add_definitions_command_with_target_prop/CMakeLists.txt
 create mode 100644 Tests/CompileDefinitions/compiletest.cpp
 create mode 100644 Tests/CompileDefinitions/target_prop/CMakeLists.txt


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list