mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 05:29:32 +00:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
84e0260e03
commit
08dc55ce84
@@ -8,6 +8,9 @@ SRC_URI += "\
|
||||
file://cmlibarchive-disable-ext2fs.patch \
|
||||
"
|
||||
|
||||
B = "${WORKDIR}/build"
|
||||
do_configure[cleandirs] = "${B}"
|
||||
|
||||
# Disable ccmake since we don't depend on ncurses
|
||||
CMAKE_EXTRACONF = "\
|
||||
-DBUILD_CursesDialog=0 \
|
||||
@@ -15,4 +18,16 @@ CMAKE_EXTRACONF = "\
|
||||
-DHAVE_SYS_ACL_H=0 \
|
||||
"
|
||||
|
||||
do_configure () {
|
||||
${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
|
||||
}
|
||||
|
||||
do_compile() {
|
||||
oe_runmake
|
||||
}
|
||||
|
||||
do_install() {
|
||||
oe_runmake 'DESTDIR=${D}' install
|
||||
}
|
||||
|
||||
do_compile[progress] = "percent"
|
||||
|
||||
@@ -21,8 +21,6 @@ SRC_URI[sha256sum] = "28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58
|
||||
|
||||
UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||
|
||||
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
|
||||
# e.g. in order to upgrade it, even when there is target qtbase)
|
||||
@@ -45,10 +43,3 @@ do_configure_prepend() {
|
||||
sed -i 's/^ find_package(Qt5Widgets REQUIRED)/# find_package(Qt5Widgets REQUIRED)/g' ${S}/Tests/QtAutogen/CMakeLists.txt
|
||||
sed -i 's/^ find_package(Qt5Core REQUIRED)/# find_package(Qt5Core REQUIRED)/g' ${S}/Tests/QtAutogen/autorcc_depends/CMakeLists.txt
|
||||
}
|
||||
|
||||
# Extra flags to pass to cmake invoked by bootstrap
|
||||
CMAKE_EXTRACONF = ""
|
||||
|
||||
do_configure () {
|
||||
${S}/configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user