]> code.ossystems Code Review - openembedded-core.git/commitdiff
cmake: fix B != S
authorRobert Yang <liezhi.yang@windriver.com>
Tue, 13 Jan 2015 02:55:19 +0000 (18:55 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 16 Jan 2015 23:06:44 +0000 (23:06 +0000)
And bump PR to avoid:
| Error when bootstrapping CMake:
| Found directory "/path/to/cmake-2.8.12.2/Bootstrap.cmk".
| Looks like somebody did bootstrap CMake in the source tree, but now you are
| trying to do bootstrap in the binary tree. Please remove Bootstrap.cmk
| directory from the source tree.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
meta/recipes-devtools/cmake/cmake.inc

index fb451fde6f6477611381774b42d5e707bf8a966b..28b7f2d887890c6d780d44e11514c5c8f7328bb0 100644 (file)
@@ -17,7 +17,9 @@ SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz
            file://cmake-2.8.11.2-FindFreetype.patch \
            "
 
-inherit autotools-brokensep
+PR = "r1"
+
+inherit autotools
 
 # Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable
 # and possibly missing qmake binary (qtbase-native can be removed from sysroot
@@ -45,5 +47,5 @@ do_configure_prepend() {
 CMAKE_EXTRACONF = ""
 
 do_configure () {
-       ./configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
+       ${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
 }