[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-702-gba83d84

[Brad King]

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  ba83d84714bff717b58ecb0c91df62ca91db3bb8 (commit)
       via  ccd29b9af849316a9361ceb8d0addb24e7158382 (commit)
      from  a0972532b3d6bc31ac3cbf432cd0566e5d4b8f31 (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=ba83d84714bff717b58ecb0c91df62ca91db3bb8
commit ba83d84714bff717b58ecb0c91df62ca91db3bb8
Merge: a097253 ccd29b9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 21 09:32:32 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 21 09:32:32 2014 -0400

    Merge topic 'ExternalData-missing-not-fatal'
    
    ccd29b9a ExternalData: Warn on missing file instead of failing


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

Summary of changes:
 Modules/ExternalData.cmake                         |   44 +++++++++++++-------
 Tests/Module/ExternalData/CMakeLists.txt           |    2 +
 Tests/Module/ExternalData/Data1Check.cmake         |   22 ++++++++++
 Tests/RunCMake/ExternalData/Directory1-stderr.txt  |    2 +-
 Tests/RunCMake/ExternalData/Directory3-result.txt  |    1 -
 Tests/RunCMake/ExternalData/Directory3-stderr.txt  |    3 +-
 Tests/RunCMake/ExternalData/MissingData-result.txt |    1 -
 Tests/RunCMake/ExternalData/MissingData-stderr.txt |    5 ++-
 Tests/RunCMake/ExternalData/MissingData-stdout.txt |    1 +
 Tests/RunCMake/ExternalData/MissingData.cmake      |   13 ++++--
 .../MissingDataWithAssociated-stderr.txt           |   15 +++++++
 .../MissingDataWithAssociated-stdout.txt           |    1 +
 .../ExternalData/MissingDataWithAssociated.cmake   |   10 +++++
 Tests/RunCMake/ExternalData/RunCMakeTest.cmake     |    1 +
 14 files changed, 96 insertions(+), 25 deletions(-)
 delete mode 100644 Tests/RunCMake/ExternalData/Directory3-result.txt
 delete mode 100644 Tests/RunCMake/ExternalData/MissingData-result.txt
 create mode 100644 Tests/RunCMake/ExternalData/MissingData-stdout.txt
 create mode 100644 Tests/RunCMake/ExternalData/MissingDataWithAssociated-stderr.txt
 create mode 100644 Tests/RunCMake/ExternalData/MissingDataWithAssociated-stdout.txt
 create mode 100644 Tests/RunCMake/ExternalData/MissingDataWithAssociated.cmake


hooks/post-receive
-- 
CMake