diff options
| author | Ross Burton <ross.burton@intel.com> | 2014-01-14 15:19:26 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-14 16:21:37 +0000 |
| commit | d3995ac14ba05c0420f15f264f7e9d0c3af71f74 (patch) | |
| tree | 1ca1260cab937c51c39e6a0b9460b917882e8607 /meta | |
| parent | 92472980b816ee9ada502c1965976cb6eedc0a27 (diff) | |
| download | openembedded-core-d3995ac14ba05c0420f15f264f7e9d0c3af71f74.tar.gz openembedded-core-d3995ac14ba05c0420f15f264f7e9d0c3af71f74.tar.bz2 openembedded-core-d3995ac14ba05c0420f15f264f7e9d0c3af71f74.zip | |
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 <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/cmake.bbclass | 9 |
1 files changed, 9 insertions, 0 deletions
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 \ |