Mercurial > vanilla

annotate dev/cmake/patch-fhs.patch @ 771:e67c258b3b1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
author David Demelier <markand@malikania.fr>
date Fri, 09 Aug 2019 20:40:00 +0200
parents e91fbcb3d1ef
children 5cfcfe086a1e
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)
771
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
61 --- Modules/GNUInstallDirs.cmake.orig 2019-08-09 15:27:50.247607285 +0200
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
62 +++ Modules/GNUInstallDirs.cmake 2019-08-09 15:29:28.923610316 +0200
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
63 @@ -36,7 +36,7 @@
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
64 # ``BINDIR``
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
65 # user executables (``bin``)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
66 # ``SBINDIR``
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
67 -# system admin executables (``sbin``)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
68 +# system admin executables (``bin``)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
69 # ``LIBEXECDIR``
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
70 # program executables (``libexec``)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
71 # ``SYSCONFDIR``
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
72 @@ -164,8 +164,8 @@
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
73
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
74 _GNUInstallDirs_cache_path(CMAKE_INSTALL_BINDIR "bin"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
75 "User executables (bin)")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
76 -_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "sbin"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
77 - "System admin executables (sbin)")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
78 +_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "bin"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
79 + "System admin executables (bin)")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
80 _GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
81 "Program executables (libexec)")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
82 _GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
83 @@ -201,52 +201,6 @@
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
84 # second time.
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
85
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
86 set(_LIBDIR_DEFAULT "lib")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
87 - # Override this default 'lib' with 'lib64' iff:
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
88 - # - we are on Linux system but NOT cross-compiling
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
89 - # - we are NOT on debian
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
90 - # - we are on a 64 bits system
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
91 - # reason is: amd64 ABI: https://github.com/hjl-tools/x86-psABI/wiki/X86-psABI
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
92 - # For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
93 - # CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
94 - # and CMAKE_INSTALL_PREFIX is "/usr"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
95 - # See http://wiki.debian.org/Multiarch
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
96 - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
97 - set(__LAST_LIBDIR_DEFAULT "lib")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
98 - # __LAST_LIBDIR_DEFAULT is the default value that we compute from
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
99 - # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX, not a cache entry for
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
100 - # the value that was last used as the default.
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
101 - # This value is used to figure out whether the user changed the
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
102 - # CMAKE_INSTALL_LIBDIR value manually, or if the value was the
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
103 - # default one. When CMAKE_INSTALL_PREFIX changes, the value is
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
104 - # updated to the new default, unless the user explicitly changed it.
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
105 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
106 - if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
107 - AND NOT CMAKE_CROSSCOMPILING)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
108 - if (EXISTS "/etc/debian_version") # is this a debian system ?
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
109 - if(CMAKE_LIBRARY_ARCHITECTURE)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
110 - if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
111 - set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
112 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
113 - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
114 - AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
115 - set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
116 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
117 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
118 - else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
119 - if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
120 - message(AUTHOR_WARNING
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
121 - "Unable to determine default CMAKE_INSTALL_LIBDIR directory because no target architecture is known. "
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
122 - "Please enable at least one language before including GNUInstallDirs.")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
123 - else()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
124 - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
125 - set(_LIBDIR_DEFAULT "lib64")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
126 - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
127 - set(__LAST_LIBDIR_DEFAULT "lib64")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
128 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
129 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
130 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
131 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
132 - endif()
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
133 if(NOT DEFINED CMAKE_INSTALL_LIBDIR)
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
134 set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
135 elseif(DEFINED __LAST_LIBDIR_DEFAULT
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
136 @@ -263,8 +217,8 @@
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
137
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
138 _GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
139 "C header files (include)")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
140 -_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/usr/include"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
141 - "C header files for non-gcc (/usr/include)")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
142 +_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "/include"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
143 + "C header files for non-gcc (/include)")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
144 _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share"
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
145 "Read-only architecture-independent data root (share)")
e67c258b3b1a dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents: 766
diff changeset
146