Mercurial > vanilla

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
766
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- Modules/Platform/UnixPaths.cmake.orig 2019-08-09 10:02:27.447007587 +0200
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ Modules/Platform/UnixPaths.cmake 2019-08-09 10:04:02.843010517 +0200
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -23,7 +23,7 @@
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 # search types.
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 # Standard
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 - /usr/local /usr /
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 + /local /
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
9
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 # CMake install location
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 "${_CMAKE_INSTALL_DIR}"
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 @@ -41,39 +41,32 @@
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 endif()
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 endif()
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
15
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 -# Non "standard" but common install prefixes
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 -list(APPEND CMAKE_SYSTEM_PREFIX_PATH
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 - /usr/X11R6
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 - /usr/pkg
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 - /opt
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 - )
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
22 -
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 # List common include file locations not under the common prefixes.
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 # X11
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 - /usr/include/X11
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 + /include/X11
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 )
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
29
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 # X11
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 - /usr/lib/X11
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 + /lib/X11
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 )
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
35
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 - /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 + /lib
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 )
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
40
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 - /usr/include
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 + /include
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 )
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 - /usr/include
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 + /include
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 )
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 list(APPEND CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 - /usr/include
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 + /include
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 )
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
53
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 # Enable use of lib32 and lib64 search path variants by default.
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS TRUE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
58 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
59 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
e91fbcb3d1ef vanilla: consolidate FHS
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS FALSE)