summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/cmake
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:08:25 +0000
commitbd52abba5fc028780497a74d41bd2e33a5723793 (patch)
tree98a38f15577a49c900ec1ae3c9df91bc6353b566 /meta/recipes-devtools/cmake
parentf7b94f68133f6d802163cfae1126075aa396f1bd (diff)
downloadpoky-bd52abba5fc028780497a74d41bd2e33a5723793.tar.gz
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. (From OE-Core rev: ade72d5bad7303a40f7b27526145ed83e372cd35) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake')
-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
17 file://cmake-2.8.11.2-FindFreetype.patch \ 17 file://cmake-2.8.11.2-FindFreetype.patch \
18 " 18 "
19 19
20inherit autotools-brokensep 20PR = "r1"
21
22inherit autotools
21 23
22# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable 24# Ugly hack to work around undefined OE_QMAKE_PATH_EXTERNAL_HOST_BINS variable
23# and possibly missing qmake binary (qtbase-native can be removed from sysroot 25# and possibly missing qmake binary (qtbase-native can be removed from sysroot
@@ -45,5 +47,5 @@ do_configure_prepend() {
45CMAKE_EXTRACONF = "" 47CMAKE_EXTRACONF = ""
46 48
47do_configure () { 49do_configure () {
48 ./configure --prefix=${prefix} -- ${CMAKE_EXTRACONF} 50 ${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
49} 51}