cmake: specify all install paths

Specify the full set of install paths (bindir, libdir, etc) for packages that
use the GNUInstallDirs module, instead of just the prefix and leaving the rest
as default (which breaks with multilib).

(From OE-Core rev: d3995ac14ba05c0420f15f264f7e9d0c3af71f74)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 3ac3fcc..7ff9984 100644 (file)
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -86,6 +86,15 @@ cmake_do_configure() {
          ${OECMAKE_SITEFILE} \
          ${S} \
          -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
+         -DCMAKE_INSTALL_BINDIR:PATH=${bindir} \
+         -DCMAKE_INSTALL_SBINDIR:PATH=${sbindir} \
+         -DCMAKE_INSTALL_LIBEXECDIR:PATH=${libexecdir} \
+         -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
+         -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${sharedstatedir} \
+         -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
+         -DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir} \
+         -DCMAKE_INSTALL_DATAROOTDIR:PATH=${datadir} \
          -DCMAKE_INSTALL_SO_NO_EXE=0 \
          -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
          -DCMAKE_VERBOSE_MAKEFILE=1 \