aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake/cmake.inc
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-01-12 18:55:19 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-16 23:06:44 +0000
commitade72d5bad7303a40f7b27526145ed83e372cd35 (patch)
tree94e6aefcc55a25f33601fb90484147ec69b4c4f5 /meta/recipes-devtools/cmake/cmake.inc
parentf8fbbc92134a8dfdbc6923cea04e55a2e73fc6dd (diff)
downloadopenembedded-core-contrib-ade72d5bad7303a40f7b27526145ed83e372cd35.tar.gz
openembedded-core-contrib-ade72d5bad7303a40f7b27526145ed83e372cd35.tar.bz2
openembedded-core-contrib-ade72d5bad7303a40f7b27526145ed83e372cd35.zip
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@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake.inc')
-rw-r--r--meta/recipes-devtools/cmake/cmake.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index fb451fde6f..28b7f2d887 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}
}