[Cmake-commits] CMake branch, master, updated. v3.2.2-849-gf438cd3

Brad King brad.king at kitware.com
Mon Apr 20 14:37:06 EDT 2015


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  f438cd373131b85dd71b1f902c56fb3584cf8f87 (commit)
       via  05245b42294a38c5f7be9b40a918e42575b7dbd7 (commit)
       via  6e23a4bdddd2bfee668c682a9ab4081b5e6fcfa2 (commit)
       via  d21ebcb2444a4b6001c5997f7004bd5cf917d71b (commit)
       via  95a27267daee021514df8c93ffd6d9b9e55dea51 (commit)
       via  7d248547361bbacb4f5b532ef2ce4f4935c97dc8 (commit)
       via  9db15954104455fef54d59c7aa029d798075bf0e (commit)
       via  5d4480a8c711a3d5971e100cc1a8984b6305c509 (commit)
       via  3a8ac2423ef658e87e366a143428835be48bf88f (commit)
       via  5947d9b031444b48a7d7a9c70ef02d2333aeabee (commit)
       via  e2d0e0fbeb1bf7b43dc55ce55c6000819d108aee (commit)
       via  3a1ad1713f87ed7219c934dcb32c4d41573807c4 (commit)
       via  f0dae032ee44283d08869c2a948f001dc211bfd5 (commit)
       via  08da8742709d6da74d1a17de46990ec5aaf3ad0f (commit)
       via  3dc4fe02e63422532486320739e0cf4abddaa270 (commit)
       via  e4f8f1f1b706d7efc9964826ff4572d27a3062d3 (commit)
       via  2d6121a9a709e319cca733787bcc21bac593a232 (commit)
       via  bdd4c5f5ba6d3bf60b4e3bc620b146784e1559f1 (commit)
       via  524ce895427557312eef52d837f0afdb39a0dab6 (commit)
       via  813cd719c41b05df7a22ad3ebd267cc9bfc2505e (commit)
       via  5c201f1ee6cc19e0f1871048a6a6af9056c5780f (commit)
       via  0d9555779d7bd2a8d068f5b9af431bcf9673453a (commit)
       via  846608f2678b4bced696857b5ca45e11bc86aa2c (commit)
       via  a2f2aeee2f4d4af1f25f4a5b86bacb8a81a7dec4 (commit)
       via  68f791cd06983e8fd375edfba74a9d821231e269 (commit)
       via  5bb4248a807029053156dbf4a3cdba4427766306 (commit)
       via  fc7ab8874b0e5c2c010fb73718ae8702b8853ca0 (commit)
      from  5e0e65c18926b0a9c5b66ff4ec93d45cc008d383 (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=f438cd373131b85dd71b1f902c56fb3584cf8f87
commit f438cd373131b85dd71b1f902c56fb3584cf8f87
Merge: 5e0e65c 05245b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 20 14:37:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 20 14:37:05 2015 -0400

    Merge topic 'clean-up-ReadListFile'
    
    05245b42 cmMakefile: Move some preamble out of the Internal method.
    6e23a4bd cmMakefile: Remove always-null first parameter to ReadListFile.
    d21ebcb2 cmMakefile: Swap parameters of calls to ReadListFile.
    95a27267 cmMakefile: Extract conditional code to caller.
    7d248547 cmMakefile: Remove intermediate variable.
    9db15954 cmMakefile: Move condition to the only calling context where it is true.
    5d4480a8 cmMakefile: Populate CMAKE_PARENT_LIST_FILE in callers.
    3a8ac242 cmMakefile: Collapse nested conditional.
    5947d9b0 cmMakefile: Convert filenametoread into a std::string.
    e2d0e0fb cmMakefile: Remove intermediate variable.
    3a1ad171 cmMakefile: Combine duplicate condition.
    f0dae032 cmMakefile: Re-order independent statements.
    08da8742 cmMakefile: Split a conditional.
    3dc4fe02 cmMakefile: Re-order independent variable setting.
    e4f8f1f1 cmMakefile: Remove intermediate variable.
    2d6121a9 cmMakefile: Remove use of intermediate variable.
    ...


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

Summary of changes:
 Source/CPack/cmCPackGenerator.cxx         |    6 +-
 Source/CPack/cpack.cxx                    |    6 +-
 Source/CTest/cmCTestLaunch.cxx            |    2 +-
 Source/CTest/cmCTestScriptHandler.cxx     |    4 +-
 Source/CTest/cmCTestTestHandler.cxx       |   10 +-
 Source/cmCTest.cxx                        |    7 +-
 Source/cmFindPackageCommand.cxx           |    4 +-
 Source/cmGlobalGenerator.cxx              |   24 ++---
 Source/cmGlobalVisualStudio6Generator.cxx |    2 +-
 Source/cmGraphVizWriter.cxx               |    2 +-
 Source/cmIncludeCommand.cxx               |    7 +-
 Source/cmLocalGenerator.cxx               |    2 +-
 Source/cmLocalUnixMakefileGenerator3.cxx  |    4 +-
 Source/cmMakefile.cxx                     |  141 +++++++++++------------------
 Source/cmMakefile.h                       |   15 ++-
 Source/cmProjectCommand.cxx               |    3 +-
 Source/cmQtAutoGenerators.cxx             |    4 +-
 Source/cmake.cxx                          |    6 +-
 18 files changed, 106 insertions(+), 143 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list