[Cmake-commits] CMake branch, master, updated. v3.3.1-1188-g982850a

Brad King brad.king at kitware.com
Wed Sep 16 08:47:27 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  982850a86698d41d6998b4d538c128949570efdf (commit)
       via  7a6e5f06e7a32c894313b3a07c3d3c9abad8d2ca (commit)
       via  401229759c2a738b085b3337babdded645415664 (commit)
       via  02440154fb457e481d44aa0a2c2134e1a66e0f4b (commit)
      from  0ec62015471eee37cb99765578e0db8b2f633350 (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=982850a86698d41d6998b4d538c128949570efdf
commit 982850a86698d41d6998b4d538c128949570efdf
Merge: 0ec6201 7a6e5f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 16 08:47:25 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 16 08:47:25 2015 -0400

    Merge topic 'test-search-ordering'
    
    7a6e5f06 Tests: Cover find_program when the environment duplicate some HINTS
    40122975 Merge branch 'fix-bad-search-ordering' into test-search-ordering
    02440154 find_*: Fix search order when the environment duplicates some HINTS


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

Summary of changes:
 Source/cmFindBase.cxx                                |    6 ++++--
 Source/cmFindPackageCommand.cxx                      |    5 ++++-
 Tests/RunCMake/find_program/A/{testA => testAandB}   |    0
 Tests/RunCMake/find_program/{A/testA => B/testAandB} |    0
 Tests/RunCMake/find_program/EnvAndHints-stdout.txt   |    1 +
 Tests/RunCMake/find_program/EnvAndHints.cmake        |    8 ++++++++
 Tests/RunCMake/find_program/RunCMakeTest.cmake       |    1 +
 7 files changed, 18 insertions(+), 3 deletions(-)
 copy Tests/RunCMake/find_program/A/{testA => testAandB} (100%)
 copy Tests/RunCMake/find_program/{A/testA => B/testAandB} (100%)
 create mode 100644 Tests/RunCMake/find_program/EnvAndHints-stdout.txt
 create mode 100644 Tests/RunCMake/find_program/EnvAndHints.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list