From patchwork Wed Sep 14 16:41:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 76226 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1967709qgf; Wed, 14 Sep 2016 09:41:49 -0700 (PDT) X-Received: by 10.98.155.154 with SMTP id e26mr6298868pfk.68.1473871309745; Wed, 14 Sep 2016 09:41:49 -0700 (PDT) Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p184si34262976pfb.299.2016.09.14.09.41.49; Wed, 14 Sep 2016 09:41:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 8666D760A5; Wed, 14 Sep 2016 16:41:47 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by mail.openembedded.org (Postfix) with ESMTP id 8D78373695 for ; Wed, 14 Sep 2016 16:41:44 +0000 (UTC) Received: by mail-wm0-f52.google.com with SMTP id k186so18386391wmd.0 for ; Wed, 14 Sep 2016 09:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=SfqMguuuit2EWrMbxSy0bzCdhfBE3GGtFy2LDu6QquY=; b=lCwH/KwSsDNPXXZGiwefDwwlEqF2wv07MZKgJjN5sVGXvMwfi0UkK9mFaKNCNNKCxo vkxujbwRwJ7gBRmWBFYSoE9/gML21TC0VQc1bpTDxtSGwGJdKhm7Djt2PuUdd/UHyF+5 2sUiAzxAXDhJi0UMnzKVnps781P5yR/SGAI36AdqlwAn88QW5gJWX1E0ldd7zisTpZ5B 5nyAKE3my6epIrUlOkoS+sb3SrSHTbwBp4YpWfY8f62QL/34BNgVjctJr9/98Q1+942C 3uib3RwBoVfY1JsgfcjfrMwdmcN8+hFtYqzTIon41gbVJE+HgJQHCmC7P0RG/WS1xKGn +gKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=SfqMguuuit2EWrMbxSy0bzCdhfBE3GGtFy2LDu6QquY=; b=aaxpFIZ4circ+u3rPjqZ+Yfa4vqsn0EtlTHxM55/DZ7gm4MX1DakXrz1Wr3162iSN9 QmnK7NgZqeE5maOhCKiPF5M1+wqapozZoXF7ElVESnviHBHDr9GgtHvSuDry7G7b9tuf H2Xny4sUG1SWTNa2VceYsl0Wgt0yCoLBGDsFjqlnM5wXQkijuw8zyio35O6tq3dX8Fgp F8CP5wA4mZvS0SoesEY2wyzq1FvPWWeYgXoAcJf7271qhWbH6RajFgwNZg3IaubdJ1n+ JfJC6CIk4j69JdrwX2SRdNC6Y9e/LLRWI+OIAt6tHkfl2+N+ZaRLuOfKWOzZywFb59RK somA== X-Gm-Message-State: AE9vXwMICcIkUyUMjK9UqnjyP19RE1Sat8V6mLoOPZobpZlZlKegClIOdIAqyumAQz+/ADzK X-Received: by 10.194.161.166 with SMTP id xt6mr3867992wjb.165.1473871303938; Wed, 14 Sep 2016 09:41:43 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id p13sm5025189wmd.1.2016.09.14.09.41.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Sep 2016 09:41:43 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 14 Sep 2016 17:41:36 +0100 Message-Id: <1473871297-28966-2-git-send-email-ross.burton@intel.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1473871297-28966-1-git-send-email-ross.burton@intel.com> References: <1473871297-28966-1-git-send-email-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/3] cmake: use convenience options for clarity X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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 --- 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 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)} \