diff options
| author | hans <hans@pkgsrc.org> | 2012-02-23 17:12:12 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-02-23 17:12:12 +0000 |
| commit | 797cdacc459aef08b86e8cb9ff1273f627e79051 (patch) | |
| tree | be7a63c05d08ae1513bba945c500d6ae7876f950 | |
| parent | feb4e7b6e942d6ffc56ef70be3b0e9c5540afab4 (diff) | |
| download | pkgsrc-797cdacc459aef08b86e8cb9ff1273f627e79051.tar.gz | |
Reorder CMake search paths so that BUILDLINK_DIR and PREFIX come first,
before / and /usr. This should prevent CMake from picking up stuff from
the base system instead of the buildlink directories.
| -rw-r--r-- | mk/cmake-Modules/Platform/UnixPaths.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/cmake-Modules/Platform/UnixPaths.cmake b/mk/cmake-Modules/Platform/UnixPaths.cmake index 39554a88f52..b852c8224f3 100644 --- a/mk/cmake-Modules/Platform/UnixPaths.cmake +++ b/mk/cmake-Modules/Platform/UnixPaths.cmake @@ -5,7 +5,7 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH # Standard - / /usr $ENV{BUILDLINK_DIR} $ENV{PREFIX} + $ENV{BUILDLINK_DIR} $ENV{PREFIX} / /usr ) SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} @@ -20,7 +20,7 @@ SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} ) SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} - /bin /usr/bin $ENV{BUILDLINK_DIR}/bin /sbin + $ENV{BUILDLINK_DIR}/bin /bin /usr/bin /sbin ) LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES |