diff options
| author |   Ross Burton <ross.burton@intel.com> | 2014-06-24 21:21:32 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-06-25 11:49:37 +0100 |
| commit | 2c23d7ab913a636aa0ab6a6e899cf6211d1e2714 (patch) | |
| tree | 3ff5a2329859e8f4fe7264edc6c741d135e22c8e | |
| parent | 76f65e73081f52cea718ef164f9d1d7a5c65d537 (diff) | |
| download | openembedded-core-contrib-2c23d7ab913a636aa0ab6a6e899cf6211d1e2714.tar.gz | |
cmake.bbclass: restore OECMAKE_SOURCEPATH
Some packages put their CMakeLists.txt file in a subdirectory, so assuming that
it is in ${S} won't work.
Restore OECMAKE_SOURCEPATH (defaulting to ${S}) so that the location of
CMakeLists.txt can be set if required.
Based on a patch by Miroslav Keš <miroslav.kes@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/cmake.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass index c9c15f3076..ab2adec782 100644 --- a/meta/classes/cmake.bbclass +++ b/meta/classes/cmake.bbclass @@ -1,3 +1,6 @@ +# Path to the CMake file to process. +OECMAKE_SOURCEPATH ?= "${S}" + DEPENDS_prepend = "cmake-native " B = "${WORKDIR}/build" @@ -65,8 +68,8 @@ EOF addtask generate_toolchain_file after do_patch before do_configure cmake_do_configure() { - if [ "${OECMAKE_BUILDPATH}" -o "${OECMAKE_SOURCEPATH}" ]; then - bbnote "cmake.bbclass no longer uses OECMAKE_SOURCEPATH and OECMAKE_BUILDPATH. The default behaviour is now out-of-tree builds with B=WORKDIR/build." + if [ "${OECMAKE_BUILDPATH}" ]; then + bbnote "cmake.bbclass no longer uses OECMAKE_BUILDPATH. The default behaviour is now out-of-tree builds with B=WORKDIR/build." fi if [ "${S}" != "${B}" ]; then @@ -84,7 +87,7 @@ cmake_do_configure() { cmake \ ${OECMAKE_SITEFILE} \ - ${S} \ + ${OECMAKE_SOURCEPATH} \ -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \ -DCMAKE_INSTALL_BINDIR:PATH=${bindir} \ -DCMAKE_INSTALL_SBINDIR:PATH=${sbindir} \ |