diff options
author | Nathan Rossi <nathan@nathanrossi.com> | 2019-04-03 05:37:02 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-09 13:44:39 +0100 |
commit | 5da6073d47dcdc335d5c225a8945f5f85609580e (patch) | |
tree | 50d91aaeab9b0e887c950afa47632e87884acfd9 | |
parent | 8217b477a10d608fe37f1151c12996a594c0fba8 (diff) | |
download | poky-5da6073d47dcdc335d5c225a8945f5f85609580e.tar.gz |
cmake-native: Enable ccmake by default and depend on ncurses
Enable the building of the curses based ui for cmake. This depends on
ncurses.
(From OE-Core rev: a8397def4eebacb8876d021129309a6903b71b2f)
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/cmake/cmake-native_3.14.1.bb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb index fedcf3d4bd..b2952ee5f5 100644 --- a/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb +++ b/meta/recipes-devtools/cmake/cmake-native_3.14.1.bb | |||
@@ -1,7 +1,7 @@ | |||
1 | require cmake.inc | 1 | require cmake.inc |
2 | inherit native | 2 | inherit native |
3 | 3 | ||
4 | DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native" | 4 | DEPENDS += "bzip2-replacement-native expat-native xz-native zlib-native curl-native ncurses-native" |
5 | 5 | ||
6 | SRC_URI += "file://OEToolchainConfig.cmake \ | 6 | SRC_URI += "file://OEToolchainConfig.cmake \ |
7 | file://environment.d-cmake.sh \ | 7 | file://environment.d-cmake.sh \ |
@@ -13,10 +13,9 @@ SRC_URI += "file://OEToolchainConfig.cmake \ | |||
13 | B = "${WORKDIR}/build" | 13 | B = "${WORKDIR}/build" |
14 | do_configure[cleandirs] = "${B}" | 14 | do_configure[cleandirs] = "${B}" |
15 | 15 | ||
16 | # Disable ccmake since we don't depend on ncurses | ||
17 | CMAKE_EXTRACONF = "\ | 16 | CMAKE_EXTRACONF = "\ |
18 | -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ | 17 | -DCMAKE_LIBRARY_PATH=${STAGING_LIBDIR_NATIVE} \ |
19 | -DBUILD_CursesDialog=0 \ | 18 | -DBUILD_CursesDialog=1 \ |
20 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ | 19 | -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ |
21 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ | 20 | -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ |
22 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ | 21 | -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=0 \ |