[OE-core] [PATCH 1/3] cmake: respect ${S} and ${B}

[Saul Wold]

On 01/10/2014 09:54 AM, Ross Burton wrote:
> Instead of the class-specific variables OECMAKE_BUILDPATH and
> OECMAKE_SOURCEPATH, just use ${B} and ${S}.
>
> If these two paths are different, delete any existing ${B} before running a
> build so that previous builds don't taint the current build.
>
> Note that OECMAKE_SOURCEPATH and OECMAKE_BUILDPATH are not respected, so recipes
> that manually set these in the past will need to be updated to either use
> something along the lines of separatebuilddir.inc or set B themselves.  If the
> old variables are set, a warning is displayed.
>
> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>   meta/classes/cmake.bbclass |   35 +++++++++++------------------------
>   1 file changed, 11 insertions(+), 24 deletions(-)
>
> diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
> index 30c1792..1dc406d2 100644
> --- a/meta/classes/cmake.bbclass
> +++ b/meta/classes/cmake.bbclass
> @@ -6,15 +6,6 @@ CCACHE = ""
>   # We want the staging and installing functions from autotools
>   inherit autotools
>
> -# Use in-tree builds by default but allow this to be changed
> -# since some packages do not support them (e.g. llvm 2.5).
> -OECMAKE_SOURCEPATH ?= "."
> -
> -# If declaring this, make sure you also set EXTRA_OEMAKE to
> -# "-C ${OECMAKE_BUILDPATH}". So it will run the right makefiles.
> -OECMAKE_BUILDPATH ?= ""
> -B="${S}"
> -
>   # C/C++ Compiler (without cpu arch/tune arguments)
>   OECMAKE_C_COMPILER ?= "`echo ${CC} | sed 's/^\([^ ]*\).*/\1/'`"
>   OECMAKE_CXX_COMPILER ?= "`echo ${CXX} | sed 's/^\([^ ]*\).*/\1/'`"
> @@ -73,10 +64,14 @@ EOF
>   addtask generate_toolchain_file after do_patch before do_configure
>
>   cmake_do_configure() {
> -	if [ ${OECMAKE_BUILDPATH} ]
> -	then
> -		mkdir -p ${OECMAKE_BUILDPATH}
> -		cd ${OECMAKE_BUILDPATH}
> +	if [ "${OECMAKE_BUILDPATH}" -o "${OECMAKE_SOURCEPATH}" ]; then
> +		bbnote "cmake.bbclass no longer uses OECMAKE_SOURCEPATH and OECMAKE_BUILDPATH. This recipe now will do in-tree builds, to do out-of-tree builds set S and B."
> +	fi
> +
> +	if [ "${S}" != "${B}" ]; then
> +		rm -rf ${B}
> +		mkdir -p ${B}
> +		cd ${B}
>   	fi
>
>   	# Just like autotools cmake can use a site file to cache result that need generated binaries to run
> @@ -88,7 +83,7 @@ cmake_do_configure() {
>
>   	cmake \
>   	  ${OECMAKE_SITEFILE} \
> -	  ${OECMAKE_SOURCEPATH} \
> +	  ${S} \
>   	  -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
>   	  -DCMAKE_INSTALL_SO_NO_EXE=0 \
>   	  -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
> @@ -98,20 +93,12 @@ cmake_do_configure() {
>   }
>
>   cmake_do_compile()  {
> -	if [ ${OECMAKE_BUILDPATH} ]
> -	then
> -		cd ${OECMAKE_BUILDPATH}
> -	fi
> -
> +	cd ${B}
>   	base_do_compile
>   }
>
>   cmake_do_install() {
> -	if [ ${OECMAKE_BUILDPATH} ];
> -	then
> -		cd ${OECMAKE_BUILDPATH}
> -	fi
> -
> +	cd ${B}
>   	autotools_do_install

This seems to cause a problem:
ERROR: Logfile of failure stored in: 
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/log.do_install.5697
Log data follows:
| DEBUG: SITE files ['endian-big', 'bit-32', 'powerpc-common', 
'common-linux', 'common-glibc', 'powerpc32-linux', 'powerpc-linux', 
'common']
| DEBUG: Executing shell function do_install
| NOTE: make -j 16 
DESTDIR=/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/image 
install
| make: *** No rule to make target `install'.  Stop.
| ERROR: oe_runmake failed
| WARNING: 
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/run.do_install.5697:1 
exit 1 from
|   exit 1
| ERROR: Function failed: do_install (log file is located at 
/srv/hdd/builds/world/tmp/work/ppc7400-poky-linux/cmake/2.8.12.1-r0/temp/log.do_install.5697)
ERROR: Task 7891 
(/srv/hdd/poky/meta/recipes-devtools/cmake/cmake_2.8.12.1.bb, 
do_install) failed with exit code '1'


Sau!

>   }
>
>