From: Ross Burton Date: Tue, 14 Jan 2014 15:19:26 +0000 (+0000) Subject: cmake: specify all install paths X-Git-Tag: 2015-4~4030 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d3995ac14ba05c0420f15f264f7e9d0c3af71f74;p=openembedded-core.git 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). Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index 3ac3fcc53d..7ff99841e2 100644 --- 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 \