diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-09-13 15:55:53 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-16 15:15:33 +0100 |
| commit | f863b227e22b67ab239ee6124471fdc14de3f017 (patch) | |
| tree | 2ca56c67019ccb8a87801832b9c591f881072dbf | |
| parent | e707718374ce1c95769a5f99aa3bfdfc0be685b2 (diff) | |
| download | openembedded-core-f863b227e22b67ab239ee6124471fdc14de3f017.tar.gz openembedded-core-f863b227e22b67ab239ee6124471fdc14de3f017.tar.bz2 openembedded-core-f863b227e22b67ab239ee6124471fdc14de3f017.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake_3.6.1.bb | 9 |
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 () { EXTRA_OECMAKE=" \ -DCMAKE_DOC_DIR=${docdir_stripped}/cmake-${CMAKE_MAJOR_VERSION} \ - -DCMAKE_USE_SYSTEM_LIBRARY_BZIP2=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_CURL=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_EXPAT=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_FORM=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBARCHIVE=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_LIBLZMA=1 \ - -DCMAKE_USE_SYSTEM_LIBRARY_ZLIB=1 \ + -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ + -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 \ -DKWSYS_CHAR_IS_SIGNED=1 \ -DBUILD_CursesDialog=0 \ ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ |