Mercurial > vanilla
annotate dev/cmake/patch-fhs.patch @ 1100:68d397064a6b
crypto/cryptsetup: initial import, closes #1017
author | David Demelier <markand@malikania.fr> |
---|---|
date | Fri, 13 Sep 2019 13:52:29 +0200 |
parents | 5cfcfe086a1e |
children |
rev | line source |
---|---|
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
1 --- Modules/Platform/UnixPaths.cmake.orig 2019-08-28 08:48:53.229519581 +0000 |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
2 +++ Modules/Platform/UnixPaths.cmake 2019-08-28 08:51:03.813523592 +0000 |
766 | 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}" | |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
12 @@ -41,52 +41,34 @@ |
766 | 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 | |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
41 -if(CMAKE_SYSROOT_COMPILE) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
42 - set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
43 -else() |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
44 - set(_cmake_sysroot_compile "${CMAKE_SYSROOT}") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
45 -endif() |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
46 - |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
47 # Default per-language values. These may be later replaced after |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
48 # parsing the implicit directory information from compiler output. |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
49 set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
50 - ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
51 - "${_cmake_sysroot_compile}/usr/include" |
766 | 52 + /include |
53 ) | |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
54 set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
55 - ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
56 - "${_cmake_sysroot_compile}/usr/include" |
766 | 57 + /include |
58 ) | |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
59 set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
60 - ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES} |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
61 - "${_cmake_sysroot_compile}/usr/include" |
766 | 62 + /include |
63 ) | |
64 | |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
65 -unset(_cmake_sysroot_compile) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
66 - |
766 | 67 # Enable use of lib32 and lib64 search path variants by default. |
68 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS TRUE) | |
69 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE) | |
70 -set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS TRUE) | |
71 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) | |
72 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) | |
73 +set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS FALSE) | |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
74 --- Modules/GNUInstallDirs.cmake.orig 2019-08-28 08:52:16.169525815 +0000 |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
75 +++ Modules/GNUInstallDirs.cmake 2019-08-28 08:56:58.197534478 +0000 |
771
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
76 @@ -36,7 +36,7 @@ |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
77 ``BINDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
78 user executables (``bin``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
79 ``SBINDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
80 - system admin executables (``sbin``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
81 + system admin executables (``bin``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
82 ``LIBEXECDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
83 program executables (``libexec``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
84 ``SYSCONFDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
85 @@ -48,12 +48,11 @@ |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
86 ``RUNSTATEDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
87 run-time variable data (``LOCALSTATEDIR/run``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
88 ``LIBDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
89 - object code libraries (``lib`` or ``lib64`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
90 - or ``lib/<multiarch-tuple>`` on Debian) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
91 + object code libraries (``lib``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
92 ``INCLUDEDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
93 C header files (``include``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
94 ``OLDINCLUDEDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
95 - C header files for non-gcc (``/usr/include``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
96 + C header files for non-gcc (``include``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
97 ``DATAROOTDIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
98 read-only architecture-independent data root (``share``) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
99 ``DATADIR`` |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
100 @@ -165,8 +164,8 @@ |
771
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
101 |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
102 _GNUInstallDirs_cache_path(CMAKE_INSTALL_BINDIR "bin" |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
103 "User executables (bin)") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
104 -_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "sbin" |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
105 - "System admin executables (sbin)") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
106 +_GNUInstallDirs_cache_path(CMAKE_INSTALL_SBINDIR "bin" |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
107 + "System admin executables (bin)") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
108 _GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBEXECDIR "libexec" |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
109 "Program executables (libexec)") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
110 _GNUInstallDirs_cache_path(CMAKE_INSTALL_SYSCONFDIR "etc" |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
111 @@ -175,97 +174,16 @@ |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
112 "Modifiable architecture-independent data (com)") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
113 _GNUInstallDirs_cache_path(CMAKE_INSTALL_LOCALSTATEDIR "var" |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
114 "Modifiable single-machine data (var)") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
115 - |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
116 -# We check if the variable was manually set and not cached, in order to |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
117 -# allow projects to set the values as normal variables before including |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
118 -# GNUInstallDirs to avoid having the entries cached or user-editable. It |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
119 -# replaces the "if(NOT DEFINED CMAKE_INSTALL_XXX)" checks in all the |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
120 -# other cases. |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
121 -# If CMAKE_INSTALL_LIBDIR is defined, if _libdir_set is false, then the |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
122 -# variable is a normal one, otherwise it is a cache one. |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
123 -get_property(_libdir_set CACHE CMAKE_INSTALL_LIBDIR PROPERTY TYPE SET) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
124 -if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
125 - AND DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
126 - AND NOT "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" STREQUAL "${CMAKE_INSTALL_PREFIX}")) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
127 - # If CMAKE_INSTALL_LIBDIR is not defined, it is always executed. |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
128 - # Otherwise: |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
129 - # * if _libdir_set is false it is not executed (meaning that it is |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
130 - # not a cache variable) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
131 - # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is not defined it is |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
132 - # not executed |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
133 - # * if _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX and |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
134 - # CMAKE_INSTALL_PREFIX are the same string it is not executed. |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
135 - # _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX is updated after the |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
136 - # execution, of this part of code, therefore at the next inclusion |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
137 - # of the file, CMAKE_INSTALL_LIBDIR is defined, and the 2 strings |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
138 - # are equal, meaning that the if is not executed the code the |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
139 - # second time. |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
140 - |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
141 - set(_LIBDIR_DEFAULT "lib") |
771
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
142 - # Override this default 'lib' with 'lib64' iff: |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
143 - # - 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
|
144 - # - we are NOT on debian |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
145 - # - we are on a 64 bits system |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
146 - # 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
|
147 - # 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
|
148 - # 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
|
149 - # and CMAKE_INSTALL_PREFIX is "/usr" |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
150 - # See http://wiki.debian.org/Multiarch |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
151 - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
152 - set(__LAST_LIBDIR_DEFAULT "lib") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
153 - # __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
|
154 - # _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
|
155 - # 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
|
156 - # 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
|
157 - # 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
|
158 - # 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
|
159 - # 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
|
160 - endif() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
161 - 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
|
162 - AND NOT CMAKE_CROSSCOMPILING) |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
163 - 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
|
164 - if(CMAKE_LIBRARY_ARCHITECTURE) |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
165 - if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
166 - set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
167 - endif() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
168 - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
169 - 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
|
170 - 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
|
171 - endif() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
172 - endif() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
173 - 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
|
174 - if(NOT DEFINED CMAKE_SIZEOF_VOID_P) |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
175 - message(AUTHOR_WARNING |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
176 - "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
|
177 - "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
|
178 - else() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
179 - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
180 - set(_LIBDIR_DEFAULT "lib64") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
181 - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
182 - set(__LAST_LIBDIR_DEFAULT "lib64") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
183 - endif() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
184 - endif() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
185 - endif() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
186 - endif() |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
187 - endif() |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
188 - if(NOT DEFINED CMAKE_INSTALL_LIBDIR) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
189 - set(CMAKE_INSTALL_LIBDIR "${_LIBDIR_DEFAULT}" CACHE PATH "Object code libraries (${_LIBDIR_DEFAULT})") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
190 - elseif(DEFINED __LAST_LIBDIR_DEFAULT |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
191 - AND "${__LAST_LIBDIR_DEFAULT}" STREQUAL "${CMAKE_INSTALL_LIBDIR}") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
192 - set_property(CACHE CMAKE_INSTALL_LIBDIR PROPERTY VALUE "${_LIBDIR_DEFAULT}") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
193 - endif() |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
194 -endif() |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
195 -_GNUInstallDirs_cache_convert_to_path(CMAKE_INSTALL_LIBDIR "Object code libraries (lib)") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
196 +_GNUInstallDirs_cache_path(CMAKE_INSTALL_LIBDIR "lib" |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
197 + "Object code libraries (lib)") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
198 |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
199 # Save for next run |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
200 set(_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE INTERNAL "CMAKE_INSTALL_PREFIX during last run") |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
201 -unset(_libdir_set) |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
202 -unset(__LAST_LIBDIR_DEFAULT) |
771
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
203 |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
204 _GNUInstallDirs_cache_path(CMAKE_INSTALL_INCLUDEDIR "include" |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
205 "C header files (include)") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
206 -_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
|
207 - "C header files for non-gcc (/usr/include)") |
934
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
208 +_GNUInstallDirs_cache_path(CMAKE_INSTALL_OLDINCLUDEDIR "include" |
5cfcfe086a1e
dev/cmake: upgrade to 3.15.2
David Demelier <markand@malikania.fr>
parents:
771
diff
changeset
|
209 + "C header files for non-gcc (include)") |
771
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
210 _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share" |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
211 "Read-only architecture-independent data root (share)") |
e67c258b3b1a
dev/cmake: adapt GNUInstallDirs to Vanilla Linux
David Demelier <markand@malikania.fr>
parents:
766
diff
changeset
|
212 |