summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-04-19 18:57:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-28 11:26:06 +0100
commitea6befae799f45cf93771442f242cb023dd809d1 (patch)
tree8142de757f2e806072032214e733663529d257f5
parent5cbf102662dde6f706a19fa133cfd1e7475eb8c1 (diff)
downloadopenembedded-core-contrib-ea6befae799f45cf93771442f242cb023dd809d1.tar.gz
openembedded-core-contrib-ea6befae799f45cf93771442f242cb023dd809d1.tar.bz2
openembedded-core-contrib-ea6befae799f45cf93771442f242cb023dd809d1.zip
cmake.bbclass: Do not use bitbake variable syntax for shell variables
Using bitbake variable syntax (i.e., ${FOO}) for shell variables is bad practice. First of all it is confusing, but more importantly it can lead to weird problems if someone actually defines a bitbake variable with the same name as the shell variable. Also use lower case for local shell variables. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/cmake.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 3f670919a8..20d8a61069 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -43,12 +43,12 @@ def map_target_arch_to_uname_arch(target_arch):
cmake_do_generate_toolchain_file() {
if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then
- CMAKE_CROSSCOMPILING="set( CMAKE_CROSSCOMPILING FALSE )"
+ cmake_crosscompiling="set( CMAKE_CROSSCOMPILING FALSE )"
fi
cat > ${WORKDIR}/toolchain.cmake <<EOF
# CMake system name must be something like "Linux".
# This is important for cross-compiling.
-${CMAKE_CROSSCOMPILING}
+$cmake_crosscompiling
set( CMAKE_SYSTEM_NAME `echo ${TARGET_OS} | sed -e 's/^./\u&/' -e 's/^\(Linux\).*/\1/'` )
set( CMAKE_SYSTEM_PROCESSOR ${@map_target_arch_to_uname_arch(d.getVar('TARGET_ARCH'))} )
set( CMAKE_C_COMPILER ${OECMAKE_C_COMPILER} )
@@ -107,13 +107,13 @@ cmake_do_configure() {
# Just like autotools cmake can use a site file to cache result that need generated binaries to run
if [ -e ${WORKDIR}/site-file.cmake ] ; then
- OECMAKE_SITEFILE=" -C ${WORKDIR}/site-file.cmake"
+ oecmake_sitefile="-C ${WORKDIR}/site-file.cmake"
else
- OECMAKE_SITEFILE=""
+ oecmake_sitefile=
fi
cmake \
- ${OECMAKE_SITEFILE} \
+ $oecmake_sitefile \
${OECMAKE_SOURCEPATH} \
-DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-DCMAKE_INSTALL_BINDIR:PATH=${@os.path.relpath(d.getVar('bindir'), d.getVar('prefix'))} \