Include the gmock prefix in the search path
ClosedPublic

Authored by tcberner on Dec 14 2019, 9:55 PM.

Details

Reviewers
wbauer
yurchor
Group Reviewers
FreeBSD
Summary

All the sources include 'gmock/gmock.h', however, the path returned
from the FindGooglemock would include the trailing 'gmock/'.

Diff Detail

Repository
R181 Amarok
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 19864
Build 19882: arc lint + arc unit
tcberner created this revision.Dec 14 2019, 9:55 PM
Restricted Application added subscribers: amarok-devel, Amarok. · View Herald TranscriptDec 14 2019, 9:55 PM
tcberner requested review of this revision.Dec 14 2019, 9:55 PM

See [1]

05:46:54  -- Found libgmock: /usr/local/include/gmock, /usr/local/lib/libgmock.so;/usr/local/lib/libgtest.so;/usr/lib/libpthread.so
[...]
05:47:24  In file included from /usr/home/jenkins/workspace/Extragear/amarok/kf5-qt5 FreeBSDQt5.13/tests/core/logger/TestLogger.cpp:21:
05:47:24  /usr/home/jenkins/workspace/Extragear/amarok/kf5-qt5 FreeBSDQt5.13/tests/mocks/MockLogger.h:20:10: fatal error: 'gmock/gmock.h' file not found
05:47:24  #include <gmock/gmock.h>
05:47:24           ^~~~~~~~~~~~~~~
05:47:24  1 error generated.

[1] https://build.kde.org/view/OS%20-%20FreeBSD/job/Extragear/job/amarok/job/kf5-qt5%20FreeBSDQt5.13/22/console

wbauer accepted this revision.Jan 3 2020, 9:18 PM

Seems to be fine.
It still finds gmock here on openSUSE and builds successfully.

This revision is now accepted and ready to land.Jan 3 2020, 9:18 PM

e17a38b179197d9afa303de6e254fbc284c5fa9e did something similar, I suppose this can be closed?

Restricted Application added a project: Amarok. · View Herald TranscriptApr 14 2020, 7:57 PM
Restricted Application removed a subscriber: Amarok. · View Herald Transcript
adridg closed this revision.May 31 2020, 4:01 PM