Thu Feb 23 17:12:12 2012 UTC ()
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.


(hans)
diff -r1.4 -r1.5 pkgsrc/mk/cmake-Modules/Platform/UnixPaths.cmake
cvs diff -r1.4 -r1.5 pkgsrc/mk/cmake-Modules/Platform/UnixPaths.cmake (expand / switch to unified diff)

--- pkgsrc/mk/cmake-Modules/Platform/UnixPaths.cmake 2011/09/29 19:27:06 1.4
+++ pkgsrc/mk/cmake-Modules/Platform/UnixPaths.cmake 2012/02/23 17:12:12 1.5
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1SET(UNIX 1) 1SET(UNIX 1)
2 2
3GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH) 3GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
4GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH) 4GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
5 5
6LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH 6LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
7 # Standard 7 # Standard
8 / /usr $ENV{BUILDLINK_DIR} $ENV{PREFIX} 8 $ENV{BUILDLINK_DIR} $ENV{PREFIX} / /usr
9 ) 9 )
10 10
11SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH} 11SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH}
12 # Standard 12 # Standard
13 $ENV{BUILDLINK_DIR}/include /include /usr/include  13 $ENV{BUILDLINK_DIR}/include /include /usr/include
14 14
15 ) 15 )
16 16
17SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 17SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
18 # Standard 18 # Standard
19 $ENV{BUILDLINK_DIR}/lib /lib /usr/lib 19 $ENV{BUILDLINK_DIR}/lib /lib /usr/lib
20 ) 20 )
21 21
22SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} 22SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
23 /bin /usr/bin $ENV{BUILDLINK_DIR}/bin /sbin 23 $ENV{BUILDLINK_DIR}/bin /bin /usr/bin /sbin
24 ) 24 )
25 25
26LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES 26LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
27 /lib /usr/lib /usr/lib32 /usr/lib64 27 /lib /usr/lib /usr/lib32 /usr/lib64
28 ) 28 )
29 29
30# Enable use of lib64 search path variants by default. 30# Enable use of lib64 search path variants by default.
31SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE) 31SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)