diff mbox

[2/3] cmake: use convenience options for clarity

Message ID 1473871297-28966-2-git-send-email-ross.burton@intel.com
State Accepted
Commit f863b227e22b67ab239ee6124471fdc14de3f017
Headers show

Commit Message

Ross Burton Sept. 14, 2016, 4:41 p.m. UTC
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>

---
 meta/recipes-devtools/cmake/cmake_3.6.1.bb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

-- 
2.8.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Ross Burton Sept. 14, 2016, 8:59 p.m. UTC | #1
On 14 September 2016 at 18:50, Otavio Salvador <
otavio.salvador@ossystems.com.br> wrote:

> Why jsoncpp cannot be also linked?

>


Because it's not in oe-core.

Ross
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Ross Burton Sept. 14, 2016, 9:12 p.m. UTC | #2
On 14 September 2016 at 22:06, Otavio Salvador <
otavio.salvador@ossystems.com.br> wrote:

> Ok; but this means it should be right?

>

> If so, we can work on a recipe for it. It is better to avoid bundled

> copies of recipe specially because security flaws...

>


Nothing else wants it, cmake ships with its own trimmed copy.  I'm not
massively convinced it's worth the bother (especially now).

Ross
-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox

Patch

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)} \