From patchwork Wed Nov 10 02:04:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 14504 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 1BC64BF415 for ; Wed, 10 Nov 2021 03:05:09 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 53ADE6034E; Wed, 10 Nov 2021 04:05:08 +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="LiyIElrn"; dkim-atps=neutral Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id B84A260234 for ; Wed, 10 Nov 2021 04:05:06 +0100 (CET) Received: by mail-pl1-x636.google.com with SMTP id n8so1824367plf.4 for ; Tue, 09 Nov 2021 19:05:06 -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=YE5KQnJ22RaCNYBTSjV2YzUxCwMlx+/X3tplBUGoB4Y=; b=LiyIElrn4ocgvNPKEx85Qbl+jRzE2epquV+oyp1p14MduIRpU/3TB5+ihLT3dbWQ7A lU8ILSNumQ0Kz4TQ75jvp5IfSDp359Pxu9GQzxOsJ0j2F3PVWMEDjurCTHrFG3E8PRhG 3Q7JuMjn9bpoO86hMr+94PVahL6BTDhssoDnA= 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=YE5KQnJ22RaCNYBTSjV2YzUxCwMlx+/X3tplBUGoB4Y=; b=m3TogeByEioyC4TAEFxeV83kyNpAdA2+FXLusPIW7B3UKC8/50c3NCXqxzHY+Ldcpz SNp30QoZiNPFP8xmqX2R1qbJOtpfwlNXnnxtQIv4Z8L9SHrzFNP/vypIlNoJBujqIyO0 dkHuEItJ91/fWGZgEqZmrwhIRxrWD+h4nH/04D+/EZwOCAs4bVwxbk1UY/toKhIaSPtd CYVaskB22i/5QYJkoBUUf8qblL1RQQ1pPLatupvzXu5YVE+uWlhRlVPu/kX3oxXYXVuW JYb3zRflpH/4PnZ1xyQ445MGivcLQW+1B0kAUy1ur4iuK1uoPWbTQ4e9GNhPDIus8fqq WPPg== X-Gm-Message-State: AOAM533N2yIhs8XvD2cpnNHQU0dp705Gbp8rgkvIbjwRLXbkk62/op4/ zXSVNK9TYCrx8TWo9iplDMp72U/31OlH+g== X-Google-Smtp-Source: ABdhPJzXkpedlALplSC+PCBmxdxeSeC+mqFvctFIrhR0XZPGiT4PBF/1jU0KHMPGlTEbqfzp8914sg== X-Received: by 2002:a17:90b:1bcf:: with SMTP id oa15mr13223180pjb.161.1636513504660; Tue, 09 Nov 2021 19:05:04 -0800 (PST) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:4a73:e1bd:9b3f:4903]) by smtp.gmail.com with ESMTPSA id mz7sm4183349pjb.7.2021.11.09.19.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 19:05:04 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 10 Nov 2021 11:04:33 +0900 Message-Id: <20211110020433.2778691-1-hiroh@chromium.org> X-Mailer: git-send-email 2.34.0.rc0.344.g81b53c2807-goog MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3] lc-compliance: Build with gtest in subprojects 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 gtest 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..391fde2c 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -1 +1,3 @@ -/libyuv \ No newline at end of file +/googletest-release* +/libyuv +/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