Commit Graph

43 Commits

Author SHA1 Message Date
Kevin Backhouse
a4164ce866
Remove libinih from codebase and add it as a dependency instead. 2022-12-28 09:33:08 -06:00
Luis Diaz Mas
861625c4e7 Remove deprecated option in conan 2022-11-21 21:52:54 +01:00
Miloš Komarčević
9a6ee59421 Support brotli compressed boxes in JPEG XL 2022-10-24 12:32:51 +02:00
Luis Diaz
0309cb01cb ci: update conan version in all jobs 2022-05-19 16:30:43 +02:00
Luis Diaz
3cd39b789a Update versions of conan dependencies 2022-05-19 15:05:13 +02:00
Shawn Baker
b95e19e72a
libcurl is now optional. Updated to the latest versions of libcurl and expat. (#1992)
* libcurl is now optional.
Updated to the latest versions of libcurl and expat.

* No need for a libcurl option, libcurl is now only required if webready is.

Co-authored-by: shawn <shawn@frozen.ca>
2021-11-03 10:42:32 +01:00
Luis Díaz Más
59a80eba2e mac - cmake_paths does not work directly on mac 2021-05-17 07:31:45 +02:00
Luis Díaz Más
6c2141959a conan - change generator to be able to use latest expat version 2021-05-17 07:31:45 +02:00
Luis Díaz Más
d3b9e6b68a ci - Using gtest as static library to avoid mac linking issues 2021-05-15 16:58:24 +02:00
Luis Diaz Mas
72798028f6 Less CI jobs on push 2021-05-12 16:10:04 +02:00
Luis Díaz Más
8265fc46ed conan - gtest debug_postfix only used in Debug mode 2021-05-03 06:40:02 +02:00
Luis Díaz Más
34164b2cf5 ci: old expat & tune gtest options for windows 2021-05-03 06:40:02 +02:00
Luis Díaz Más
7975b6402a conan: put win dlls into bin directory 2021-04-23 14:53:08 +02:00
Luis Díaz Más
53f18cf408 conan: use cmake_paths generator instead of cmake
We also upgraded the xcode version on Travis-CI
2021-04-23 14:53:08 +02:00
Luis Díaz Más
8de2d7a34e conan: fixes for Windows 2021-04-23 14:53:08 +02:00
Luis Díaz Más
f601d23d5e conan: update conan recipe versions 2021-04-23 14:53:08 +02:00
Luis Díaz Más
cd5c8fba49 remove some cmake old checks + newer gtest version 2021-04-15 06:56:37 +02:00
Robin Mills
a1abe21a71 Discussion: https://github.com/Exiv2/exiv2/issues/1200#issuecomment-623975537 2020-05-05 11:58:55 +01:00
Luis Diaz Mas
edaad36ceb Update conan version in appveyor & use python-x64 version
- Use latest libcurl version (trying to solve problem with OpenSSL on windows builds)
- Delete appveyor build with Visual Studio Generator: problematic with OpenSSL conan recipe
2020-04-02 17:46:45 +02:00
Luis Diaz Mas
ef4315fe28 appveyor: upgrate to python 3.7 and conan 1.17.2
- Also upgrade travis builder to the same conan version
- Different versions of libcurl/libopenssl for appveyor/travis
2019-07-27 08:18:57 +02:00
Luis Díaz Más
bfd659a63e Conan: Updates to fix sudden linkage issues
We suddenly started to have some linking issues in the 0.27 branch after
the libcurl packages were updated in the conan-center repositories.
After some experimentation I took the following steps to fix up the
situation:

- Update conan to latest version
- Update of libcurl to the latest version available
- Use libcurl static libraries

Note that the change to use static libraries is just to make the
deployment step as easier as possible in the travis builds.
2019-07-13 09:04:22 +02:00
Luis Diaz Mas
dbed8472b9 conan: update gtest version and way in which we create the conan profile
- use default profile
- Use libstc+11 for the conan profile
- gtest-1.8.0 for MSVC < 12.
2019-01-13 10:11:00 +01:00
Luis Díaz Más
4a9667071e conan: do not bring libcurl on Mac OSX 2019-01-12 23:19:08 +01:00
Luis Díaz Más
635f21e4f7 conan: update libcurl version 2019-01-12 23:16:51 +01:00
Luis Díaz Más
4fa2bc7008 Propagate CURL linkage when it is enabled 2019-01-12 23:13:24 +01:00
Luis Díaz Más
9e0bbd0205 Conan: updating to expat 2.2.6 2018-11-26 15:23:30 +01:00
Luis Díaz Más
48f50342a8 conan: fix typo. Use libiconv for windows with the proper option 2018-11-11 12:27:26 +01:00
Luis Díaz Más
4ffdfb0ce0 conan - Disable WEBREADY libraries by default (curl + openssl). 2018-10-16 17:09:17 +02:00
Luis Díaz Más
18ded9ccf3 Use static version of libcurl.
Note that this will simplify the packaging/deployment
2018-09-12 19:22:31 +02:00
Luis Díaz Más
24be5a514e [Appveyor] Build exiv2 with Visual Studio 2012 and 2013
- Integration tests had to be disabled with 2012 and 2013. There were
few (4) tests failing for these cases.
- Only bring libiconv with conan when a windows subsystem is detected.
- libiconv can be enabled now with a conan option.
- Use infinity instead of INFINITY
- Use conan_basic_setup(). Fixes a problem with gtest is VS2012
- call vcvarsall.bat for each compiler version so that nmake can be
found.
2018-09-10 10:31:00 +02:00
Luis Díaz Más
9f67edd9bd Conan: bring libiconv dependency for Windows 2018-06-01 06:55:38 +02:00
Luis Díaz Más
9cd8cc0968 conan: Do not bring Expat when xmp=True.
Since the external XMP SDK is already adding the expat sources to the XMPCore library, we do not
need the Expat dependency for Exiv2.
2018-05-29 10:03:41 +02:00
Luis Diaz Mas
96aa7ef3d7 Add info about adding the piponazo's conan repository 2018-05-29 10:03:41 +02:00
Luis Diaz Mas
9586928d29 Add CMake code to handle external XMP
Experiment: Try with testing package
2018-05-29 10:03:41 +02:00
Luis Díaz Más
c3629117d8 conan: Upgrade libcurl version
Thanks to this upgrade the cmake code that handles the CURL dependency
can be simplified. Now we can use the shared version of CURL in all the
platforms. However we will use for the moment the static version on Mac,
since we are having some issues with 'make tests'. Once those tests are
migrated to python we can also use the shared version there.
2018-05-22 22:53:18 +02:00
Luis Díaz Más
02aa13abf3 Install conan-dependencies DLLs into install/bin.
We also changed the way in which we copy the DLLs to the bin folder inside the build directory.
Before we were directly placing the conan-deps DLLs into the bin folder directly. Now we place
them into a directory called conanDlls, and from there we copy them to bin or install/bin
at build and install steps respectively.
2018-04-19 17:19:47 +02:00
Luis Díaz Más
eb61e57de0 [conan] Update to conan 1.1.1 and recipes in which we depend on
* Update dependency on libexpat to version 2.2.5
    This new version of the conan recipe contain packages for new compilers
* Get gtest and libcurl from bincrafters
* Update the zlib dependency
* Use clang-5.0
2018-03-22 22:52:59 +01:00
Luis Díaz Más
74a5c5f770 [travis] Fix mac osx jobs
- Specify concrete ubuntu and mac versions
- Use latest conan version
- Fix the profiles for linux and mac
- Use new version of expat (avilable in conan-center)
- Install urllib3 as suggested in python guidelines
- Use virtualenv with python3
2017-12-13 15:12:20 +01:00
Luis Diaz Mas
c243727264 Update zlib version in conanfile.py.
- The previous version of the zlib recipe failed to compile in new
  version of gcc (7.2)
2017-11-07 17:08:42 +01:00
Pix4d
3f53588de7 (Travis) Should run tests on mac 2017-10-16 07:27:32 +02:00
Luis Díaz Más
89629f0056 (CMake) Bring GTest and GMock via conan 2017-10-16 07:27:32 +02:00
Luis Diaz Mas
8f0a2721fc Using Conan in appveyor 2017-09-03 16:35:41 +02:00
Luis Diaz Mas
e05010daf5 Add conan support. Bring Expat, Zlib and libcurl using conan 2017-09-03 16:35:41 +02:00