[oe-commits] [openembedded-core] 12/14: cmake: use convenience options for clarity
git at git.openembedded.org
git at git.openembedded.org
Thu Sep 15 15:44:34 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 33a0e3efc99169c93301c26f409ed2c4bdd0a35f
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Sep 13 15:55:53 2016 +0100
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 at intel.com>
---
meta/recipes-devtools/cmake/cmake_3.6.1.bb | 9 ++-------
1 file 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 2f188f0..67ba9c4 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)} \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list