Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issues with Gtest and MinGW #1265

Merged
merged 5 commits into from
Feb 15, 2019
Merged

Fix issues with Gtest and MinGW #1265

merged 5 commits into from
Feb 15, 2019

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Feb 14, 2019

No description provided.

dg0yt added 4 commits February 14, 2019 16:52
@dg0yt
Use GTest 1.8.1
5c42478 
This fixes issues with MinGW when threads are used.
@dg0yt
Remove legacy cmake commands
51e7646 
PROJ requires CMake >= 3.5.
@dg0yt
Link gtest library with GTest:: prefix
8d73f7c 
GTest::gtest is the imported target supplied by find_package(GTest).
For the internal build of GTest, this target is created as an alias
for now: find_package cannot be used because the interal build does
not get installed, and so a package config file is not available.
@dg0yt
Mark the external GTest package as required
965f89c 
GTest provides a configuration file, so we can disable the module
mode. If the GTest package cannot be found, this shall be reported
right here. (Note that while we specify a version, we do not require
an EXACT match.)
@dg0yt dg0yt mentioned this pull request Feb 14, 2019
Merged
@dg0yt
Copy link
Contributor Author

dg0yt commented Feb 14, 2019

  • Tested on Windows (MSys2-provided mingw-w64) with internal and external GTest.
  • For configuring with external GTest, I had to provide -DGTest_DIR=...GTest
  • For all tests to pass, I had to run them with PROJ_LIB=...data

QuLogic
QuLogic approved these changes Feb 15, 2019
View reviewed changes
Copy link
Contributor

@QuLogic QuLogic left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WFM w.r.t. external GTest.

@dg0yt
Copy link
Contributor Author

dg0yt commented Feb 15, 2019

Visual Studio x86 CI is happy now, too.

@dg0yt
Copy link
Contributor Author

dg0yt commented Feb 15, 2019

Not sure where the two extra Travis CI jobs come from. I doubt they do something different than the one that succeeded.

@kbevers
Copy link
Member

kbevers commented Feb 15, 2019

Not sure where the two extra Travis CI jobs come from. I doubt they do something different than the one that succeeded.

It's been happening some times lately. They are just linking to the already finished build, so everything is fine. Thanks for taking care of this.

@kbevers kbevers merged commit 7df282b into OSGeo:master Feb 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuLogic QuLogic QuLogic approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dg0yt @kbevers @QuLogic