diff options
| author | Brad King <brad.king@kitware.com> | 2010-01-13 18:36:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-01-13 18:36:03 (GMT) |
| commit | 12dcf9e4fb23101a0cb589305f65b2c123c29139 (patch) | |
| tree | 1e5f48b20d8b7cfab321b54834d55e393c4ae80d | |
| parent | b05ed467497507169091359aa869a1f6e655ac4d (diff) | |
| download | CMake-12dcf9e4fb23101a0cb589305f65b2c123c29139.zip CMake-12dcf9e4fb23101a0cb589305f65b2c123c29139.tar.gz CMake-12dcf9e4fb23101a0cb589305f65b2c123c29139.tar.bz2 | |
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.
| -rw-r--r-- | Modules/Platform/UnixPaths.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake index ea64b78..025ae51 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -33,7 +33,7 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) # search types. LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH # Standard - /usr/local / /usr + /usr/local /usr / # CMake install location "${_CMAKE_INSTALL_DIR}" |