diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-01-12 18:55:19 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:06:44 +0000 |
| commit | ade72d5bad7303a40f7b27526145ed83e372cd35 (patch) | |
| tree | 94e6aefcc55a25f33601fb90484147ec69b4c4f5 /meta/recipes-devtools/cmake | |
| parent | f8fbbc92134a8dfdbc6923cea04e55a2e73fc6dd (diff) | |
| download | openembedded-core-contrib-ade72d5bad7303a40f7b27526145ed83e372cd35.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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/cmake')
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index fb451fde6f6..28b7f2d8878 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} } |