Mercurial > vanilla

comparison dev/cmake/patch-fhs.patch @ 766:e91fbcb3d1ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vanilla: consolidate FHS
author David Demelier <markand@malikania.fr>
date Fri, 09 Aug 2019 20:10:00 +0200
parents
children e67c258b3b1a
comparison
equal deleted inserted replaced
765:859f76ffb512 766:e91fbcb3d1ef
1 --- Modules/Platform/UnixPaths.cmake.orig 2019-08-09 10:02:27.447007587 +0200
2 +++ Modules/Platform/UnixPaths.cmake 2019-08-09 10:04:02.843010517 +0200
3 @@ -23,7 +23,7 @@
4 # search types.
5 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
6 # Standard
7 - /usr/local /usr /
8 + /local /
9
10 # CMake install location
11 "${_CMAKE_INSTALL_DIR}"
12 @@ -41,39 +41,32 @@
13 endif()
14 endif()
15
16 -# Non "standard" but common install prefixes
17 -list(APPEND CMAKE_SYSTEM_PREFIX_PATH
18 - /usr/X11R6
19 - /usr/pkg
20 - /opt
21 - )
22 -
23 # List common include file locations not under the common prefixes.
24 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
25 # X11
26 - /usr/include/X11
27 + /include/X11
28 )
29
30 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
31 # X11
32 - /usr/lib/X11
33 + /lib/X11
34 )
35
36 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
37 - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
38 + /lib
39 )
40
41 list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
42 - /usr/include
43 + /include
44 )
45 list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
46 - /usr/include
47 + /include
48 )
49 list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
50 - /usr/include
51 + /include
52 )
53
54 # Enable use of lib32 and lib64 search path variants by default.
55 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE)
56 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
57 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS TRUE)
58 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
59 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
60 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS FALSE)