summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-01-14 15:19:26 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-14 17:03:55 +0000
commit18e62b88e9a4e998d5e83dd26c135dee5595096f (patch)
treee326f505a65a75890d44bdb56b4555478efb1acb /meta
parent6d339b84d5f2380a879d4b414d45daa5455475b3 (diff)
downloadpoky-18e62b88e9a4e998d5e83dd26c135dee5595096f.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/cmake.bbclass9
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() {
86 ${OECMAKE_SITEFILE} \ 86 ${OECMAKE_SITEFILE} \
87 ${S} \ 87 ${S} \
88 -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ 88 -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
89 -DCMAKE_INSTALL_BINDIR:PATH=${bindir} \
90 -DCMAKE_INSTALL_SBINDIR:PATH=${sbindir} \
91 -DCMAKE_INSTALL_LIBEXECDIR:PATH=${libexecdir} \
92 -DCMAKE_INSTALL_SYSCONFDIR:PATH=${sysconfdir} \
93 -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=${sharedstatedir} \
94 -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=${localstatedir} \
95 -DCMAKE_INSTALL_LIBDIR:PATH=${libdir} \
96 -DCMAKE_INSTALL_INCLUDEDIR:PATH=${includedir} \
97 -DCMAKE_INSTALL_DATAROOTDIR:PATH=${datadir} \
89 -DCMAKE_INSTALL_SO_NO_EXE=0 \ 98 -DCMAKE_INSTALL_SO_NO_EXE=0 \
90 -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ 99 -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
91 -DCMAKE_VERBOSE_MAKEFILE=1 \ 100 -DCMAKE_VERBOSE_MAKEFILE=1 \