gtest/gmock: bump to version 1.8.0
authorCarlos Santos <casantos@datacom.ind.br>
Tue, 14 Feb 2017 11:05:16 +0000 (09:05 -0200)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Sun, 5 Mar 2017 21:09:02 +0000 (22:09 +0100)
commit6a9c6311f8fd4464b5555773589f587338f694a0
treef7e1504f977af3244372ef690e1ee70665a4e68f
parentcf38fa8338db7d9ec98e4c03c75661cfb88eb7e4
gtest/gmock: bump to version 1.8.0

GTest version 1.8.0 includes gmock so merge both packages inside gtest

In this merge:

- Add gmock as a suboption of gtest (BR2_PACKAGE_GTEST_GMOCK)
  following advice from Arnout Vandecappelle
- Add BR2_PACKAGE_GMOCK as a legacy entry, selecting BR2_PACKAGE_GTEST
  and BR2_PACKAGE_GTEST_GMOCK.
- Use cmake to install libraries and headers and add missing files
  (gtest.pc, gtest-config, gmock.pc) in
  GTEST_POST_INSTALL_STAGING_HOOKS instead of redefining
  GTEST_INSTALL_STAGING_CMDS
- Remove patch on Python as gmock/gtest now supports python 3.0
  (commit 456fc2b5c4e9ebf05a5987dfe1ff0ac9ffeb53cc)
- Add the correct license in HOST_GTEST_LICENSE as all python code in
  googlemock/scripts/generator is licensed under Apache-2.0 and not
  BSD-3c
- Fix URL of gtest project in Config.in
- Remove the gmock entry from DEVELOPERS
- Install gmock_gen directly, instead of as a symlink to gmock_gen.py

Notice that any external package that depends on gmock will cause an
immediate build termination because make doesn't know how to build
gmock. Since the user has just removed gmock from the legacy menu, it
should be quite obvious what needs to be done.

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
[Thomas:
 - Use += instead of = when assigning a value to <pkg>_DEPENDENCIES in
   conditional
 - Remove comment about the "tricky logic" around BUILD_GTEST and
   BUILD_GMOCK
 - Move GTEST_GMOCK_INSTALL_MISSING_FILE inside
   the ($(BR2_PACKAGE_GTEST_GMOCK),y) condition.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
13 files changed:
Config.in.legacy
DEVELOPERS
package/Config.in
package/gmock/0001-force-use-python2.patch [deleted file]
package/gmock/Config.in [deleted file]
package/gmock/gmock.hash [deleted file]
package/gmock/gmock.mk [deleted file]
package/gmock/gmock.pc [deleted file]
package/gtest/Config.in
package/gtest/gmock.pc [new file with mode: 0644]
package/gtest/gtest.hash
package/gtest/gtest.mk
package/gtest/gtest.pc