[Cmake-commits] [cmake-commits] king committed UnixPaths.cmake 1.14 1.15

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv21117/Modules/Platform

Modified Files:
	UnixPaths.cmake 
Log Message:
Find locally installed software first

This commit re-orders the search path prefix list from

  /
  /usr
  /usr/local

to

  /usr/local
  /
  /usr

so that locally-installed software is preferred.

This makes the search consistent with the Filesystem Hierarchy Standard:

  http://www.pathname.com/fhs/

See issue #9657.


Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -C 2 -d -r1.14 -r1.15
*** UnixPaths.cmake	25 Feb 2009 16:44:46 -0000	1.14
--- UnixPaths.cmake	5 Oct 2009 15:09:15 -0000	1.15
***************
*** 10,14 ****
  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
!   / /usr /usr/local
  
    # CMake install location
--- 10,14 ----
  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
!   /usr/local / /usr
  
    # CMake install location