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, next has been updated via 35f46e30fe43345610408874db2504614bc72d47 (commit) via af2a0b5b0facf8b08ebffaefa5a2a3f8723851d5 (commit) via 82df6286943681765a47d55b431eae952960f5d3 (commit) via 02440154fb457e481d44aa0a2c2134e1a66e0f4b (commit) from ef34192b04d49f21d39ecb9ceebfd5d95ec35bc2 (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=35f46e30fe43345610408874db2504614bc72d47 commit 35f46e30fe43345610408874db2504614bc72d47 Merge: ef34192 af2a0b5 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Sep 14 14:54:44 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Mon Sep 14 14:54:44 2015 -0400 Merge topic 'fix-bad-search-ordering-for-master' into next af2a0b5b Tests: Cover find_program when the environment duplicate some HINTS 82df6286 Merge branch 'fix-bad-search-ordering' into fix-bad-search-ordering-for-master 02440154 find_*: Fix search order when the environment duplicates some HINTS http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af2a0b5b0facf8b08ebffaefa5a2a3f8723851d5 commit af2a0b5b0facf8b08ebffaefa5a2a3f8723851d5 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Sep 14 14:49:49 2015 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Sep 14 14:49:49 2015 -0400 Tests: Cover find_program when the environment duplicate some HINTS Reported-by: Marc CHEVRIER <marc.chevr...@sap.com> diff --git a/Tests/RunCMake/find_program/A/test b/Tests/RunCMake/find_program/A/test new file mode 100755 index 0000000..1a24852 --- /dev/null +++ b/Tests/RunCMake/find_program/A/test @@ -0,0 +1 @@ +#!/bin/sh diff --git a/Tests/RunCMake/find_program/B/test b/Tests/RunCMake/find_program/B/test new file mode 100755 index 0000000..1a24852 --- /dev/null +++ b/Tests/RunCMake/find_program/B/test @@ -0,0 +1 @@ +#!/bin/sh diff --git a/Tests/RunCMake/find_program/EnvAndHints-stdout.txt b/Tests/RunCMake/find_program/EnvAndHints-stdout.txt new file mode 100644 index 0000000..113263e --- /dev/null +++ b/Tests/RunCMake/find_program/EnvAndHints-stdout.txt @@ -0,0 +1 @@ +-- PROG='[^']*/Tests/RunCMake/find_program/A/test' diff --git a/Tests/RunCMake/find_program/EnvAndHints.cmake b/Tests/RunCMake/find_program/EnvAndHints.cmake new file mode 100644 index 0000000..3e30157 --- /dev/null +++ b/Tests/RunCMake/find_program/EnvAndHints.cmake @@ -0,0 +1,6 @@ +set(ENV{PATH} ${CMAKE_CURRENT_SOURCE_DIR}/A) +find_program(PROG + NAMES test + HINTS ${CMAKE_CURRENT_SOURCE_DIR}/A ${CMAKE_CURRENT_SOURCE_DIR}/B + ) +message(STATUS "PROG='${PROG}'") diff --git a/Tests/RunCMake/find_program/RunCMakeTest.cmake b/Tests/RunCMake/find_program/RunCMakeTest.cmake index 2adec11..89307c1 100644 --- a/Tests/RunCMake/find_program/RunCMakeTest.cmake +++ b/Tests/RunCMake/find_program/RunCMakeTest.cmake @@ -1,5 +1,6 @@ include(RunCMake) +run_cmake(EnvAndHints) run_cmake(DirsPerName) run_cmake(NamesPerDir) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82df6286943681765a47d55b431eae952960f5d3 commit 82df6286943681765a47d55b431eae952960f5d3 Merge: 0e7f34c 0244015 Author: Brad King <brad.k...@kitware.com> AuthorDate: Mon Sep 14 14:49:37 2015 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Sep 14 14:49:37 2015 -0400 Merge branch 'fix-bad-search-ordering' into fix-bad-search-ordering-for-master http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=02440154fb457e481d44aa0a2c2134e1a66e0f4b commit 02440154fb457e481d44aa0a2c2134e1a66e0f4b Author: Chuck Atkins <chuck.atk...@kitware.com> AuthorDate: Wed Sep 9 16:03:04 2015 -0400 Commit: Brad King <brad.k...@kitware.com> CommitDate: Mon Sep 14 14:43:38 2015 -0400 find_*: Fix search order when the environment duplicates some HINTS Refactoring in the topic merged by commit v3.2.0-rc1~400 (Merge topic 'refactor-search-path-construction', 2014-11-13) introduced a bug that filters out duplicate paths in an incorrect order. Restore the search path to its documented order even when duplicate paths are present. Reported-by: Marc CHEVRIER <marc.chevr...@sap.com> diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index add06a7..e2f86ce 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -207,6 +207,10 @@ void cmFindBase::ExpandPaths() { this->FillCMakeEnvironmentPath(); } + } + this->FillUserHintsPath(); + if(!this->NoDefaultPath) + { if(!this->NoSystemEnvironmentPath) { this->FillSystemEnvironmentPath(); @@ -216,8 +220,6 @@ void cmFindBase::ExpandPaths() this->FillCMakeSystemVariablePath(); } } - - this->FillUserHintsPath(); this->FillUserGuessPath(); } diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx index 68a6558..bf4033e 100644 --- a/Source/cmFindPackageCommand.cxx +++ b/Source/cmFindPackageCommand.cxx @@ -1133,6 +1133,10 @@ void cmFindPackageCommand::ComputePrefixes() { this->FillPrefixesCMakeEnvironment(); } + } + this->FillPrefixesUserHints(); + if(!this->NoDefaultPath) + { if(!this->NoSystemEnvironmentPath) { this->FillPrefixesSystemEnvironment(); @@ -1150,7 +1154,6 @@ void cmFindPackageCommand::ComputePrefixes() this->FillPrefixesSystemRegistry(); } } - this->FillPrefixesUserHints(); this->FillPrefixesUserGuess(); this->ComputeFinalPaths(); ----------------------------------------------------------------------- Summary of changes: hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits