summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-09-13 15:55:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-16 15:24:03 +0100
commit04cc7ab0fbea7e70487926205d3a3b1989a56b47 (patch)
tree941aaac66f89bf00590cb5829ecaae252ae434b1 /meta
parent12cd9c01fc8127069386da0d1728bf1ff17f8db1 (diff)
downloadpoky-04cc7ab0fbea7e70487926205d3a3b1989a56b47.tar.gz
cmake: use convenience options for clarity
The intention here was "everything but jsoncpp is system provided" so use the convenience option to ensure this remains true in the future. (From OE-Core rev: f863b227e22b67ab239ee6124471fdc14de3f017) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/cmake/cmake_3.6.1.bb9
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-devtools/cmake/cmake_3.6.1.bb b/meta/recipes-devtools/cmake/cmake_3.6.1.bb
index 2f188f0712..67ba9c473d 100644
--- a/meta/recipes-devtools/cmake/cmake_3.6.1.bb
+++ b/meta/recipes-devtools/cmake/cmake_3.6.1.bb
@@ -25,13 +25,8 @@ python () {
25 25
26EXTRA_OECMAKE=" \ 26EXTRA_OECMAKE=" \
27 -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ 27 -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \
28 -DCMAKE_USE_SYSTEM_LIBRARY_BZIP2=1 \ 28 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
29 -DCMAKE_USE_SYSTEM_LIBRARY_CURL=1 \ 29 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \
30 -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=1 \
31 -DCMAKE_USE_SYSTEM_LIBRARY_FORM=1 \
32 -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=1 \
33 -DCMAKE_USE_SYSTEM_LIBRARY_LIBLZMA=1 \
34 -DCMAKE_USE_SYSTEM_LIBRARY_ZLIB=1 \
35 -DKWSYS_CHAR_IS_SIGNED=1 \ 30 -DKWSYS_CHAR_IS_SIGNED=1 \
36 -DBUILD_CursesDialog=0 \ 31 -DBUILD_CursesDialog=0 \
37 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ 32 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \