cmake: Improve method for not building ccmake
In commit 4bee0a93ed985b38c6b4eb605d8e16f5d7c82d51 I introduced an unnecessary patch to do something that can easily be done without patching. The argument to disable building ccmake can be passed to configure provided it is preceded by "--". (From OE-Core rev: eaf176eaabb4c558ad76512b30b28ec97fd90bc6) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
68a55c8ff7
commit
c0ac09ab49
|
@ -6,8 +6,12 @@ DEPENDS += "bzip2-native zlib-native"
|
||||||
|
|
||||||
SRC_URI += "\
|
SRC_URI += "\
|
||||||
file://cmlibarchive-disable-ext2fs.patch \
|
file://cmlibarchive-disable-ext2fs.patch \
|
||||||
file://disable-bootstrap-cursesdialog.patch \
|
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66"
|
SRC_URI[md5sum] = "17c6513483d23590cbce6957ec6d1e66"
|
||||||
SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e"
|
SRC_URI[sha256sum] = "8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e"
|
||||||
|
|
||||||
|
# Disable ccmake since we don't depend on ncurses
|
||||||
|
CMAKE_EXTRACONF = "\
|
||||||
|
-DBUILD_CursesDialog=0 \
|
||||||
|
"
|
||||||
|
|
|
@ -43,6 +43,9 @@ do_configure_prepend() {
|
||||||
sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt
|
sed -i 's/^find_package(Qt5Widgets QUIET)/#find_package(Qt5Widgets QUIET)/g' ${S}/Source/QtDialog/CMakeLists.txt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Extra flags to pass to cmake invoked by bootstrap
|
||||||
|
CMAKE_EXTRACONF = ""
|
||||||
|
|
||||||
do_configure () {
|
do_configure () {
|
||||||
./configure --prefix=${prefix}
|
./configure --prefix=${prefix} -- ${CMAKE_EXTRACONF}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
Disable building CursesDialog so that cmake-native doesn't have to
|
|
||||||
depend on ncurses-native.
|
|
||||||
|
|
||||||
Upstream-status: Inappropriate [disable feature]
|
|
||||||
|
|
||||||
Signed-off-by: Mike Crowe <mac@mcrowe.com>
|
|
||||||
|
|
||||||
--- cmake-2.8.12.2/bootstrap~ 2014-01-16 17:15:09.000000000 +0000
|
|
||||||
+++ cmake-2.8.12.2/bootstrap 2014-04-01 21:27:23.841996822 +0100
|
|
||||||
@@ -1578,6 +1578,7 @@ export MAKE
|
|
||||||
|
|
||||||
# Run bootstrap CMake to configure real CMake
|
|
||||||
cmake_options="-DCMAKE_BOOTSTRAP=1"
|
|
||||||
+cmake_options="${cmake_options} -DBUILD_CursesDialog=0"
|
|
||||||
if [ -n "${cmake_verbose}" ]; then
|
|
||||||
cmake_options="${cmake_options} -DCMAKE_VERBOSE_MAKEFILE=1"
|
|
||||||
fi
|
|
Loading…
Reference in New Issue