[oe-commits] Robert Yang : cmake: fix B != S

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: ade72d5bad7303a40f7b27526145ed83e372cd35
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=ade72d5bad7303a40f7b27526145ed83e372cd35

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Mon Jan 12 18:55:19 2015 -0800

cmake: fix B != S

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 at windriver.com>

---

 meta/recipes-devtools/cmake/cmake.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index fb451fd..28b7f2d 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -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}
 }