[Cmake-commits] CMake branch, master, updated. v3.0.0-rc6-1039-g99d6fa0

Brad King brad.king at kitware.com
Wed Jun 4 09:18:47 EDT 2014


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  99d6fa0aa108c7d757111c8528e11e6c9272beb5 (commit)
       via  44e2923f332653f6b1aad610b314a9edbdf6bf24 (commit)
      from  a1e742c3b0b451f3477ab0bc56781d8035ddb029 (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=99d6fa0aa108c7d757111c8528e11e6c9272beb5
commit 99d6fa0aa108c7d757111c8528e11e6c9272beb5
Merge: a1e742c 44e2923
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 4 09:18:46 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 4 09:18:46 2014 -0400

    Merge topic 'fix-build-crash-on-bad-generator'
    
    44e2923f cmake: Fix --build crash on bad CMAKE_GENERATOR in cache


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

Summary of changes:
 Source/cmake.cxx                                               |    8 +++++++-
 Tests/RunCMake/CommandLine/RunCMakeTest.cmake                  |    7 +++++++
 .../build-bad-generator-result.txt}                            |    0
 Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt      |    1 +
 .../build-no-cache-result.txt}                                 |    0
 Tests/RunCMake/CommandLine/build-no-cache-stderr.txt           |    1 +
 .../build-no-generator-result.txt}                             |    0
 Tests/RunCMake/CommandLine/build-no-generator-stderr.txt       |    1 +
 Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt  |    1 +
 .../RunCMake/CommandLine/cache-no-generator/CMakeCache.txt     |    0
 10 files changed, 18 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/build-bad-generator-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/build-bad-generator-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/build-no-cache-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/build-no-cache-stderr.txt
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CommandLine/build-no-generator-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CommandLine/build-no-generator-stderr.txt
 create mode 100644 Tests/RunCMake/CommandLine/cache-bad-generator/CMakeCache.txt
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/CommandLine/cache-no-generator/CMakeCache.txt (100%)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list