1 |
commit: a26f145f893c3aeffbbbd6ff7dac932c44b6e024 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 30 21:15:39 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 29 13:55:37 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a26f145f |
7 |
|
8 |
cmake.eclass: Reformat the cmake code we write to lowercase calls |
9 |
|
10 |
Add some indendation, drop space between function name and brackets, |
11 |
cleanup old style if-else-endif. |
12 |
|
13 |
Bug: https://bugs.gentoo.org/739230 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
eclass/cmake.eclass | 106 +++++++++++++++++++++++++--------------------------- |
17 |
1 file changed, 51 insertions(+), 55 deletions(-) |
18 |
|
19 |
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass |
20 |
index ddee554d429..62fa0271570 100644 |
21 |
--- a/eclass/cmake.eclass |
22 |
+++ b/eclass/cmake.eclass |
23 |
@@ -292,7 +292,7 @@ _cmake_modify-cmakelists() { |
24 |
# NOTE Append some useful summary here |
25 |
cat >> "${CMAKE_USE_DIR}"/CMakeLists.txt <<- _EOF_ || die |
26 |
|
27 |
- MESSAGE(STATUS "<<< Gentoo configuration >>> |
28 |
+ message(STATUS "<<< Gentoo configuration >>> |
29 |
Build type \${CMAKE_BUILD_TYPE} |
30 |
Install path \${CMAKE_INSTALL_PREFIX} |
31 |
Compiler flags: |
32 |
@@ -392,12 +392,12 @@ cmake_src_configure() { |
33 |
local build_rules=${BUILD_DIR}/gentoo_rules.cmake |
34 |
|
35 |
cat > "${build_rules}" <<- _EOF_ || die |
36 |
- SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) |
37 |
- SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE) |
38 |
- SET (CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE) |
39 |
- SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) |
40 |
- SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) |
41 |
- SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) |
42 |
+ set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE) |
43 |
+ set(CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM-ATT_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c -x assembler <SOURCE>" CACHE STRING "ASM-ATT compile command" FORCE) |
44 |
+ set(CMAKE_ASM-ATT_LINK_FLAGS "-nostdlib" CACHE STRING "ASM-ATT link flags" FORCE) |
45 |
+ set(CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE) |
46 |
+ set(CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE) |
47 |
+ set(CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> <INCLUDES> ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE) |
48 |
_EOF_ |
49 |
|
50 |
local myCC=$(tc-getCC) myCXX=$(tc-getCXX) myFC=$(tc-getFC) |
51 |
@@ -409,14 +409,14 @@ cmake_src_configure() { |
52 |
# space separated. |
53 |
local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake |
54 |
cat > ${toolchain_file} <<- _EOF_ || die |
55 |
- SET (CMAKE_ASM_COMPILER "${myCC/ /;}") |
56 |
- SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}") |
57 |
- SET (CMAKE_C_COMPILER "${myCC/ /;}") |
58 |
- SET (CMAKE_CXX_COMPILER "${myCXX/ /;}") |
59 |
- SET (CMAKE_Fortran_COMPILER "${myFC/ /;}") |
60 |
- SET (CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) |
61 |
- SET (CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) |
62 |
- SET (CMAKE_SYSTEM_PROCESSOR "${CHOST%%-*}") |
63 |
+ set(CMAKE_ASM_COMPILER "${myCC/ /;}") |
64 |
+ set(CMAKE_ASM-ATT_COMPILER "${myCC/ /;}") |
65 |
+ set(CMAKE_C_COMPILER "${myCC/ /;}") |
66 |
+ set(CMAKE_CXX_COMPILER "${myCXX/ /;}") |
67 |
+ set(CMAKE_Fortran_COMPILER "${myFC/ /;}") |
68 |
+ set(CMAKE_AR $(type -P $(tc-getAR)) CACHE FILEPATH "Archive manager" FORCE) |
69 |
+ set(CMAKE_RANLIB $(type -P $(tc-getRANLIB)) CACHE FILEPATH "Archive index generator" FORCE) |
70 |
+ set(CMAKE_SYSTEM_PROCESSOR "${CHOST%%-*}") |
71 |
_EOF_ |
72 |
|
73 |
# We are using the C compiler for assembly by default. |
74 |
@@ -432,24 +432,24 @@ cmake_src_configure() { |
75 |
Winnt) |
76 |
sysname="Windows" |
77 |
cat >> "${toolchain_file}" <<- _EOF_ || die |
78 |
- SET (CMAKE_RC_COMPILER $(tc-getRC)) |
79 |
+ set(CMAKE_RC_COMPILER $(tc-getRC)) |
80 |
_EOF_ |
81 |
;; |
82 |
*) sysname="${KERNEL}" ;; |
83 |
esac |
84 |
|
85 |
cat >> "${toolchain_file}" <<- _EOF_ || die |
86 |
- SET (CMAKE_SYSTEM_NAME "${sysname}") |
87 |
+ set(CMAKE_SYSTEM_NAME "${sysname}") |
88 |
_EOF_ |
89 |
|
90 |
if [ "${SYSROOT:-/}" != "/" ] ; then |
91 |
# When cross-compiling with a sysroot (e.g. with crossdev's emerge wrappers) |
92 |
# we need to tell cmake to use libs/headers from the sysroot but programs from / only. |
93 |
cat >> "${toolchain_file}" <<- _EOF_ || die |
94 |
- SET (CMAKE_FIND_ROOT_PATH "${SYSROOT}") |
95 |
- SET (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) |
96 |
- SET (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) |
97 |
- SET (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |
98 |
+ set(CMAKE_FIND_ROOT_PATH "${SYSROOT}") |
99 |
+ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) |
100 |
+ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) |
101 |
+ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) |
102 |
_EOF_ |
103 |
fi |
104 |
fi |
105 |
@@ -458,20 +458,16 @@ cmake_src_configure() { |
106 |
cat >> "${build_rules}" <<- _EOF_ || die |
107 |
# in Prefix we need rpath and must ensure cmake gets our default linker path |
108 |
# right ... except for Darwin hosts |
109 |
- IF (NOT APPLE) |
110 |
- SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) |
111 |
- SET (CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" |
112 |
- CACHE STRING "" FORCE) |
113 |
- |
114 |
- ELSE () |
115 |
- |
116 |
- SET (CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE) |
117 |
- SET (CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE) |
118 |
- SET (CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) |
119 |
- SET (CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) |
120 |
- SET (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) |
121 |
- |
122 |
- ENDIF (NOT APPLE) |
123 |
+ if(NOT APPLE) |
124 |
+ set(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) |
125 |
+ set(CMAKE_PLATFORM_REQUIRED_RUNTIME_PATH "${EPREFIX}/usr/${CHOST}/lib/gcc;${EPREFIX}/usr/${CHOST}/lib;${EPREFIX}/usr/$(get_libdir);${EPREFIX}/$(get_libdir)" CACHE STRING "" FORCE) |
126 |
+ else() |
127 |
+ set(CMAKE_PREFIX_PATH "${EPREFIX}/usr" CACHE STRING "" FORCE) |
128 |
+ set(CMAKE_MACOSX_RPATH ON CACHE BOOL "" FORCE) |
129 |
+ set(CMAKE_SKIP_BUILD_RPATH OFF CACHE BOOL "" FORCE) |
130 |
+ set(CMAKE_SKIP_RPATH OFF CACHE BOOL "" FORCE) |
131 |
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "" FORCE) |
132 |
+ endif() |
133 |
_EOF_ |
134 |
fi |
135 |
|
136 |
@@ -479,41 +475,41 @@ cmake_src_configure() { |
137 |
local common_config=${BUILD_DIR}/gentoo_common_config.cmake |
138 |
local libdir=$(get_libdir) |
139 |
cat > "${common_config}" <<- _EOF_ || die |
140 |
- SET (CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build") |
141 |
- SET (LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE) |
142 |
- SET (CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries") |
143 |
- SET (CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "") |
144 |
- SET (CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "") |
145 |
- SET (CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules") |
146 |
- SET (CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") |
147 |
- SET (BUILD_SHARED_LIBS ON CACHE BOOL "") |
148 |
+ set(CMAKE_GENTOO_BUILD ON CACHE BOOL "Indicate Gentoo package build") |
149 |
+ set(LIB_SUFFIX ${libdir/lib} CACHE STRING "library path suffix" FORCE) |
150 |
+ set(CMAKE_INSTALL_LIBDIR ${libdir} CACHE PATH "Output directory for libraries") |
151 |
+ set(CMAKE_INSTALL_INFODIR "${EPREFIX}/usr/share/info" CACHE PATH "") |
152 |
+ set(CMAKE_INSTALL_MANDIR "${EPREFIX}/usr/share/man" CACHE PATH "") |
153 |
+ set(CMAKE_USER_MAKE_RULES_OVERRIDE "${build_rules}" CACHE FILEPATH "Gentoo override rules") |
154 |
+ set(CMAKE_INSTALL_DOCDIR "${EPREFIX}/usr/share/doc/${PF}" CACHE PATH "") |
155 |
+ set(BUILD_SHARED_LIBS ON CACHE BOOL "") |
156 |
_EOF_ |
157 |
|
158 |
if [[ -n ${_ECM_ECLASS} ]]; then |
159 |
- echo 'SET (ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die |
160 |
+ echo 'set(ECM_DISABLE_QMLPLUGINDUMP ON CACHE BOOL "")' >> "${common_config}" || die |
161 |
fi |
162 |
|
163 |
# See bug 689410 |
164 |
if [[ "${ARCH}" == riscv ]]; then |
165 |
- echo 'SET (CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die |
166 |
+ echo 'set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX '"${libdir#lib}"' CACHE STRING "library search suffix" FORCE)' >> "${common_config}" || die |
167 |
fi |
168 |
|
169 |
if [[ "${NOCOLOR}" = true || "${NOCOLOR}" = yes ]]; then |
170 |
- echo 'SET (CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" || die |
171 |
+ echo 'set(CMAKE_COLOR_MAKEFILE OFF CACHE BOOL "pretty colors during make" FORCE)' >> "${common_config}" || die |
172 |
fi |
173 |
|
174 |
# Wipe the default optimization flags out of CMake |
175 |
if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]]; then |
176 |
cat >> ${common_config} <<- _EOF_ || die |
177 |
- SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
178 |
- SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
179 |
- SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
180 |
- SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
181 |
- SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
182 |
- SET (CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
183 |
- SET (CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
184 |
- SET (CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
185 |
- SET (CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
186 |
+ set(CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
187 |
+ set(CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
188 |
+ set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
189 |
+ set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
190 |
+ set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
191 |
+ set(CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
192 |
+ set(CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
193 |
+ set(CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
194 |
+ set(CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") |
195 |
_EOF_ |
196 |
fi |