[Buildroot] [PATCH 1/1] package/gtest: host-gtest install like a normal cmake package
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Jan 9 21:00:20 UTC 2022
Paul, All,
Sorry for the long delay...
On 2020-12-16 12:44 -0500, Paul Soucy spake thusly:
> host-gtest does not actually build and install gtest libraries or header files, it just installs the gmock_gen stuff. This patch will now build and install gtest to the host like a normal cmake package.
I rewrapped the commit log, and slightly extended it with the
information you rpovided elsewhere in the thread.
> Signed-off-by: Paul Soucy <paul.soucy at sense.com>
> ---
> package/gtest/gtest.mk | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/package/gtest/gtest.mk b/package/gtest/gtest.mk
> index 7f967b8bfb..f35ae63383 100644
> --- a/package/gtest/gtest.mk
> +++ b/package/gtest/gtest.mk
> @@ -88,14 +88,15 @@ else
> GTEST_CONF_OPTS += -DBUILD_GMOCK=OFF
> endif
>
> -define HOST_GTEST_INSTALL_CMDS
> +define HOST_GTEST_POST_INSTALL_PYTHON
> $(INSTALL) -D -m 0755 $(@D)/googlemock/scripts/generator/gmock_gen.py \
> $(HOST_DIR)/bin/gmock_gen
> cp -rp $(@D)/googlemock/scripts/generator/cpp \
> $(HOST_GTEST_GMOCK_PYTHONPATH)
> endef
>
> +HOST_GTEST_POST_INSTALL_HOOKS += HOST_GTEST_POST_INSTALL_PYTHON
> +
> +
$ make check-package
package/gtest/gtest.mk:64: consecutive empty lines
Applied to master with the above fixed, thanks.
Regards,
Yann E. MORIN.
> $(eval $(cmake-package))
> -# The host package does not build anything, just installs gmock_gen stuff, so
> -# it does not need to be a host-cmake-package.
> -$(eval $(host-generic-package))
> +$(eval $(host-cmake-package))
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list