[Cmake-commits] CMake branch, master, updated. v3.4.0-603-g99533c8

Brad King brad.king at kitware.com
Wed Nov 25 09:21:51 EST 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  99533c8e345c627f5f5a98be5cda7b7624756fb9 (commit)
       via  62126b67e0048800a833d3c4ea86d2307f1a4a06 (commit)
       via  2e28c619f8997a2b86c72b53659be371ff10a790 (commit)
       via  b219ff94acf0b6c934c35e2ce42dfbf99580f1e8 (commit)
      from  2b24fbf48ce00777738c306354c8c7ec2cb3237b (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=99533c8e345c627f5f5a98be5cda7b7624756fb9
commit 99533c8e345c627f5f5a98be5cda7b7624756fb9
Merge: 2b24fbf 62126b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 25 09:21:49 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 25 09:21:49 2015 -0500

    Merge topic 'fix-find_package-version-file-error-stack'
    
    62126b67 Merge branch 'test-cmake_policy-unmatched' into fix-find_package-version-file-error-stack
    2e28c619 cmState: Skip variable scope snapshots to avoid call stack duplicates
    b219ff94 Tests: Add case for package version file unmatched policy scope


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

Summary of changes:
 Source/cmState.cxx                                               |    6 ++++--
 .../CMP0004-NEW-result.txt => find_package/PolicyPop-result.txt} |    0
 Tests/RunCMake/find_package/PolicyPop-stderr.txt                 |    5 +++++
 Tests/RunCMake/find_package/PolicyPop.cmake                      |    1 +
 .../RunCMake/find_package/PolicyPop/PolicyPopConfig.cmake        |    0
 .../RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake |    3 +++
 .../PolicyPush-result.txt}                                       |    0
 Tests/RunCMake/find_package/PolicyPush-stderr.txt                |    5 +++++
 Tests/RunCMake/find_package/PolicyPush.cmake                     |    1 +
 .../RunCMake/find_package/PolicyPush/PolicyPushConfig.cmake      |    0
 .../find_package/PolicyPush/PolicyPushConfigVersion.cmake        |    3 +++
 Tests/RunCMake/find_package/RunCMakeTest.cmake                   |    2 ++
 12 files changed, 24 insertions(+), 2 deletions(-)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => find_package/PolicyPop-result.txt} (100%)
 create mode 100644 Tests/RunCMake/find_package/PolicyPop-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/PolicyPop.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_package/PolicyPop/PolicyPopConfig.cmake (100%)
 create mode 100644 Tests/RunCMake/find_package/PolicyPop/PolicyPopConfigVersion.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => find_package/PolicyPush-result.txt} (100%)
 create mode 100644 Tests/RunCMake/find_package/PolicyPush-stderr.txt
 create mode 100644 Tests/RunCMake/find_package/PolicyPush.cmake
 copy Modules/IntelVSImplicitPath/hello.f => Tests/RunCMake/find_package/PolicyPush/PolicyPushConfig.cmake (100%)
 create mode 100644 Tests/RunCMake/find_package/PolicyPush/PolicyPushConfigVersion.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list