[Cmake-commits] CMake branch, master, updated. v3.5.0-rc3-178-ga6e6f93

Brad King brad.king at kitware.com
Tue Mar 8 08:39:39 EST 2016


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  a6e6f93b6c32c941e2ccc91c754812df049f9832 (commit)
       via  72e0dc58d3caf63a57975e97ce13c5dc4b38cf9b (commit)
      from  b14fe5c176141244a71736c34e905a3a30e84601 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a6e6f93b6c32c941e2ccc91c754812df049f9832
commit a6e6f93b6c32c941e2ccc91c754812df049f9832
Merge: b14fe5c 72e0dc5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 8 08:39:37 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 8 08:39:37 2016 -0500

    Merge topic 'toolchain-file-project'
    
    72e0dc58 Diagnose recursive project/enable_language without crashing (#15999)


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

Summary of changes:
 Source/cmGlobalGenerator.cxx                       |   21 ++++++++++++++++++++
 Source/cmGlobalGenerator.h                         |    1 +
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../CMakeLists.txt                                 |    2 +-
 .../CallEnableLanguage-result.txt}                 |    0
 .../ToolchainFile/CallEnableLanguage-stderr.txt    |    5 +++++
 .../CallEnableLanguage-toolchain.cmake             |    1 +
 .../ToolchainFile/CallEnableLanguage.cmake         |    0
 .../CallProject-result.txt}                        |    0
 .../RunCMake/ToolchainFile/CallProject-stderr.txt  |    5 +++++
 .../ToolchainFile/CallProject-toolchain.cmake      |    1 +
 .../RunCMake/ToolchainFile/CallProject.cmake       |    0
 Tests/RunCMake/ToolchainFile/RunCMakeTest.cmake    |    9 +++++++++
 13 files changed, 45 insertions(+), 1 deletion(-)
 copy Tests/RunCMake/{AutoExportDll => ToolchainFile}/CMakeLists.txt (63%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ToolchainFile/CallEnableLanguage-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ToolchainFile/CallEnableLanguage-stderr.txt
 create mode 100644 Tests/RunCMake/ToolchainFile/CallEnableLanguage-toolchain.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/ToolchainFile/CallEnableLanguage.cmake (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ToolchainFile/CallProject-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ToolchainFile/CallProject-stderr.txt
 create mode 100644 Tests/RunCMake/ToolchainFile/CallProject-toolchain.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/ToolchainFile/CallProject.cmake (100%)
 create mode 100644 Tests/RunCMake/ToolchainFile/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list