Commit Graph

15 Commits

Author SHA1 Message Date
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