Skip to content

Commit

Permalink
lc-compliance: Build with gtest in subprojects
Browse files Browse the repository at this point in the history
libgtest-dev is provided as a static library at least by 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 <hiroh@chromium.org>
Tested-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
  • Loading branch information
Hirokazu Honda authored and kbingham committed Nov 15, 2021
1 parent d6f4abe commit 0d50a04
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
~~~~~~~~~~~~~~~~~~~~~~
Expand Down
16 changes: 14 additions & 2 deletions src/lc-compliance/meson.build
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
# 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

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_enabled = true

lc_compliance_sources = files([
Expand Down
4 changes: 3 additions & 1 deletion subprojects/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/libyuv
/googletest-release*
/libyuv
/packagecache
14 changes: 14 additions & 0 deletions subprojects/gtest.wrap
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 0d50a04

Please sign in to comment.