From patchwork Tue Nov 9 05:32:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14492 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id A9CFFBDB1C for ; Tue, 9 Nov 2021 05:32:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 614036035D; Tue, 9 Nov 2021 06:32:29 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="W5j0hiHb"; dkim-atps=neutral Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id E2CA560121 for ; Tue, 9 Nov 2021 06:32:27 +0100 (CET) Received: by mail-pl1-x62b.google.com with SMTP id p18so18810681plf.13 for ; Mon, 08 Nov 2021 21:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gCVBL6psSZp+28SnQoOz/49kpY3TiYZeNyVThFWCMLs=; b=W5j0hiHb1Gf45e2ydnPAHHvCKkN2kqpgVC5+jU4wDLmKM/DlWagoVCFUn+mBpUs7cw Uo1jgj77DQM/SaxTjwisdIWkVTzk4J9VQh8rt1/H6d9S/bMffekS+pbiZ6r6svIHUfRw xNbmDUl/CuiVV+oiLYiUWYJFgzwaW8FbzvzP8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gCVBL6psSZp+28SnQoOz/49kpY3TiYZeNyVThFWCMLs=; b=gRX8dxRL14tbkuohuhJo+Kwg34x3vSDP/9ZJ79IU8/dDC4f0zq/NghtcqFvCmdFFJP ujJOmwQCQAfaekYl7GtygT7iZMBlC2beb/yhx+MEKPjLfHYau5KGOS00nbGxMh7PzDXx zr2BtvSPMjHYctXfvZEaG/MxDaR7xRHor/g9mBxxc7mLzN59860QsSwfzev7OciMQKq5 v1E6ue8IjGmVAMxEEAVrWhoZLlOSEeA8UJQOfvjB+RCELW/zy4fH+AdDXpXMhLZHDVwm 5L9UkctDAYM/y3Gz3KxFnVRG9mBzVgGaAsmbZcGkaIh1xDRL5nfAW3kikIEsEU+iPcgE Ynsw== X-Gm-Message-State: AOAM530urGfXPfzo4l/++b2YDioywdBL93CFyHu4bG4DTFzvPUPkRVT8 lYPNhMJKVoFx0scgiKt7WrLsdPzanGv1SA== X-Google-Smtp-Source: ABdhPJzBTCSUye9fXe55CkNx0qLcW8mlOqpxKyvyDjzU9XAwIb4qrr31ygc+mbuv1pRsgIVo6ij5tg== X-Received: by 2002:a17:90b:3845:: with SMTP id nl5mr4315808pjb.102.1636435945855; Mon, 08 Nov 2021 21:32:25 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:ce76:c693:200e:b870]) by smtp.gmail.com with ESMTPSA id b130sm17501666pfb.9.2021.11.08.21.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Nov 2021 21:32:25 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Tue, 9 Nov 2021 14:32:19 +0900 Message-Id: <20211109053219.2682711-1-hiroh@chromium.org> X-Mailer: git-send-email 2.34.0.rc0.344.g81b53c2807-goog MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2] lc-compliance: Build with googltest in subproject X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" libgtest-dev is provided as a static library at least Debian 10. The compiler and linker to create the static library might be different from ones used for libcamera. This causes a problem upon linking. This puts googltest code to subprojects, builds the code and link it for lc-compliance. However, libgtest is locally built as a library on ChromeOS and thus the used compiler and linker are the same as one used for libcamera. We don't do these on ChromeOS build environment. Signed-off-by: Hirokazu Honda Tested-by: Jacopo Mondi Reviewed-by: Kieran Bingham --- README.rst | 2 +- src/lc-compliance/meson.build | 16 ++++++++++++++-- subprojects/.gitignore | 4 +++- subprojects/gtest.wrap | 14 ++++++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 subprojects/gtest.wrap diff --git a/README.rst b/README.rst index 8af5f118..c48b4dba 100644 --- a/README.rst +++ b/README.rst @@ -99,7 +99,7 @@ for android: [optional] libexif-dev libjpeg-dev libyaml-dev for lc-compliance: [optional] - libevent-dev libgtest-dev + libevent-dev Using GStreamer plugin ~~~~~~~~~~~~~~~~~~~~~~ diff --git a/src/lc-compliance/meson.build b/src/lc-compliance/meson.build index aa5852f6..8c43ef12 100644 --- a/src/lc-compliance/meson.build +++ b/src/lc-compliance/meson.build @@ -1,15 +1,27 @@ # SPDX-License-Identifier: CC0-1.0 libevent = dependency('libevent_pthreads', required : get_option('lc-compliance')) -libgtest = dependency('gtest', required : get_option('lc-compliance')) -if not (libevent.found() and libgtest.found()) +if not libevent.found() lc_compliance_enabled = false subdir_done() endif lc_compliance_enabled = true +if get_option('android_platform') == 'cros' + libgtest = dependency('gtest', required : get_option('lc-compliance')) + + if not libgtest.found() + lc_compliance_enabled = false + subdir_done() + endif + +else + libgtest_sp = subproject('gtest') + libgtest = libgtest_sp.get_variable('gtest_dep') +endif + lc_compliance_sources = files([ '../cam/event_loop.cpp', '../cam/options.cpp', diff --git a/subprojects/.gitignore b/subprojects/.gitignore index 410b8bd6..82ef2c83 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -1 +1,3 @@ -/libyuv \ No newline at end of file +/libyuv +/googletest-release* +/packagecache \ No newline at end of file diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap new file mode 100644 index 00000000..40128b35 --- /dev/null +++ b/subprojects/gtest.wrap @@ -0,0 +1,14 @@ +[wrap-file] +directory = googletest-release-1.11.0 +source_url = https://github.com/google/googletest/archive/release-1.11.0.zip +source_filename = gtest-1.11.0.zip +source_hash = 353571c2440176ded91c2de6d6cd88ddd41401d14692ec1f99e35d013feda55a +patch_filename = gtest_1.11.0-1_patch.zip +patch_url = https://wrapdb.mesonbuild.com/v2/gtest_1.11.0-1/get_patch +patch_hash = d38c39184384608b08419be52aed1d0f9d9d1b5ed71c0c35e51cccbdddab7084 + +[provide] +gtest = gtest_dep +gtest_main = gtest_main_dep +gmock = gmock_dep +gmock_main = gmock_main_dep