[Cmake-commits] [cmake-commits] king committed UnixPaths.cmake 1.17 1.18

[cmake-commits at cmake.org]

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

Modified Files:
	UnixPaths.cmake 
Log Message:
Search prefix /usr before root prefix /

Commit "Find locally installed software first" made /usr/local the first
prefix searched to be consistent with the Filesystem Hierarchy Standard:

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

The standard also implies that the root prefix "/" should not have any
package or development files.  The "/bin" and "/lib" directories should
have only minimal contents to boot the system.  No "/include" ever
exists.  This commit re-orders the search path prefix list from

  /usr/local
  /
  /usr

to

  /usr/local
  /usr
  /

to prefer package and development files over low-level system files.
See issue #10136.

On Cygwin /usr/lib == /lib and /usr/bin == /bin.  This change also makes
search results report locations as "/usr/..." instead of "/lib/...".
See issue #10122.


Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** UnixPaths.cmake	5 Oct 2009 15:47:24 -0000	1.17
--- UnixPaths.cmake	13 Jan 2010 18:36:03 -0000	1.18
***************
*** 34,38 ****
  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
!   /usr/local / /usr
  
    # CMake install location
--- 34,38 ----
  LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
    # Standard
!   /usr/local /usr /
  
    # CMake install location