Apart from what Saul said, this looks good to me. Ross
On 17 June 2014 21:20, Miroslav Keš <[email protected]> wrote: > On 06/13/14 18:38, Burton, Ross wrote: >> On 13 June 2014 17:33, Miroslav Keš <[email protected]> wrote: >>> + if [ -z "${OECMAKE_SOURCEPATH}" ]; then >>> + OECMAKE_SOURCEPATH="${S}" >>> fi >>> >>> if [ "${S}" != "${B}" ]; then >>> @@ -84,7 +88,7 @@ cmake_do_configure() { >>> >>> cmake \ >>> ${OECMAKE_SITEFILE} \ >>> - ${S} \ >>> + ${OECMAKE_SOURCEPATH} \ >> A better idiom that's more self-documenting would be to set >> OECMAKE_SOURCEPATH ?= "${S}" at the top-level. >> >> Would it be sensible to give that variable a different name as it >> refers specifically to the location of the cmake file, and not the >> rest of the source? >> >> Ross > > Here is the updated patch: > > Signed-off-by: Mira Kes <[email protected]> > > diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass > index c9c15f3..f762792 100644 > --- a/meta/classes/cmake.bbclass > +++ b/meta/classes/cmake.bbclass > @@ -23,6 +23,9 @@ OECMAKE_RPATH ?= "" > OECMAKE_PERLNATIVE_DIR ??= "" > OECMAKE_EXTRA_ROOT_PATH ?= "" > > +# Path to the CMake file to process. > +OECMAKE_SOURCEPATH ?= "${S}" > + > cmake_do_generate_toolchain_file() { > cat > ${WORKDIR}/toolchain.cmake <<EOF > # CMake system name must be something like "Linux". > @@ -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} \ > > -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
