diff options
author | Ross Burton <ross.burton@intel.com> | 2016-09-14 17:41:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-16 15:24:02 +0100 |
commit | 08dc55ce846ee198e69e36dd8b49d26610279c86 (patch) | |
tree | 6107286c95416f4c6733a12a15bd807534d39186 /meta/recipes-devtools/cmake/cmake.inc | |
parent | 84e0260e036a5b294a37069fe163cb395e6427f4 (diff) | |
download | poky-08dc55ce846ee198e69e36dd8b49d26610279c86.tar.gz |
cmake: don't inherit autotools
cmake doesn't use autotools, the functions get replaced by either cmake.bbclass
(target) or the recipe itself (native) leaving just lots of superfluous
dependencies.
(From OE-Core rev: b8700e9fd30317d0ad583febb4e6f385284bdd51)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/cmake/cmake.inc')
-rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 1f73b3afab..4fcb0b1ed0 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc | |||
@@ -21,8 +21,6 @@ SRC_URI[sha256sum] = "28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58 | |||
21 | 21 | ||
22 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" | 22 | UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar" |
23 | 23 | ||
24 | inherit autotools | ||
25 | |||
26 | # 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 |
27 | # 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 |
28 | # e.g. in order to upgrade it, even when there is target qtbase) | 26 | # e.g. in order to upgrade it, even when there is target qtbase) |
@@ -45,10 +43,3 @@ do_configure_prepend() { | |||
45 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt | 43 | sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt |
46 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt | 44 | sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt |
47 | } | 45 | } |
48 | |||
49 | # Extra flags to pass to cmake invoked by bootstrap | ||
50 | CMAKE_EXTRACONF = "" | ||
51 | |||
52 | do_configure () { | ||
53 | ${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF} | ||
54 | } | ||