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.

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

Update conan version & recipes + improvements on GTest & CMake #1585

Merged
merged 8 commits into from
Apr 23, 2021

Conversation

piponazo
Copy link
Collaborator

@piponazo piponazo commented Apr 23, 2021

In this PR I took actions on several things I had in my "TODO list" for the main branch:

  1. Update conan version in CI configurations (from 1.30 to 1.35).
  2. Upgrade the conan recipes being used (So that we verify that we can work with latest version of the library dependencies).
  3. Remove gtestwrapper.h and use gtest.h directly. That wrapper was used in the past to avoid some compiler warnings/errors, but it is not needed anymore.
  4. Use the exiv2lib_int OBJECT library for the unit tests target. This avoids the recompilation of many sources when enabling the unit tests in the project.

Furthermore I had to do other changes to deal with different issues after doing the previous changes:

  1. Usage of "-Wno-deprecated-declarations" in travis-ci configuration. The jobs using the clang compiler were finding such warnings when compiling the unit tests. At somepoint we should replace the deprecated functions by the new ones, but that would affect people in older distributions still using GTest 1.8.
  2. Travis-CI macOS jobs upgraded to xcode12.2.
  3. Now we use the conan cmake_paths generator instead of the cmake one. For our case, it is easier to use, less code, and it also solved an issue I had with macOS (https://travis-ci.org/github/Exiv2/exiv2/jobs/768071045).
  4. After all these changes, I could cleanup a bit the CMake code (areas related to conan stuff)

@piponazo piponazo self-assigned this Apr 23, 2021
if self.options.xmp:
self.requires('XmpSdk/2016.7@piponazo/stable') # from conan-piponazo
else:
self.requires('expat/2.3.0')
self.requires('expat/2.2.7')
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Long to explain, but 'expat/2.3.0' does not work on windows. So I reverted this change and we keep using 2.2.7

@piponazo piponazo merged commit 7975b64 into main Apr 23, 2021
@piponazo piponazo deleted the main-updateConan branch April 23, 2021 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants