diff --git a/README-CONAN.md b/README-CONAN.md index 7ba3cf3b..1afec592 100644 --- a/README-CONAN.md +++ b/README-CONAN.md @@ -1,3 +1,7 @@ +| Travis | AppVeyor | GitLab| Codecov| Repology| Chat | +|:-------------:|:-------------:|:-----:|:------:|:-------:|:----:| +| [![Build Status](https://travis-ci.org/Exiv2/exiv2.svg?branch=0.27-maintenance)](https://travis-ci.org/Exiv2/exiv2) | [![Build status](https://ci.appveyor.com/api/projects/status/d6vxf2n0cp3v88al/branch/0.27-maintenance?svg=true)](https://ci.appveyor.com/project/piponazo/exiv2-wutfp/branch/0.27-maintenance) | [![pipeline status](https://gitlab.com/D4N/exiv2/badges/0.27-maintenance/pipeline.svg)](https://gitlab.com/D4N/exiv2/commits/0.27-maintenance) | [![codecov](https://codecov.io/gh/Exiv2/exiv2/branch/0.27-maintenance/graph/badge.svg)](https://codecov.io/gh/Exiv2/exiv2) | [![Packaging status](https://repology.org/badge/tiny-repos/exiv2.svg)](https://repology.org/metapackage/exiv2/versions) | [![#exiv2-chat on matrix.org](matrix-standard-vector-logo-xs.png)](https://matrix.to/#/#exiv2-chat:matrix.org) | + ![Exiv2](exiv2.png) # Building Exiv2 and dependencies with conan @@ -78,7 +82,7 @@ $ conan profile list ``` _**Visual Studio Users**_ -_The profile msvc2019Release `%USERPROFILE%\.conan\profiles\msvc2019Release` is:_ +_The profile msvc2019Release96 in `%USERPROFILE%\.conan\profiles\msvc2019Release64` is:_ ```ini [build_requires] @@ -103,7 +107,7 @@ _Profiles for Visual Studio are discussed in detail here: [Visual Studio Notes]( | | Build Steps | Linux and macOS | Visual Studio | |:--|:--------------|--------------------------------|------------------------------| -| _**1**_ | Get conan to fetch dependencies

The output can be quite
long as conan downloads and/or builds
zlib, expat, curl and other dependencies.| $ conan install ..
     --build missing | c:\\..\\build> conan install .. --build missing
    --profile msvc2019Release | +| _**1**_ | Get conan to fetch dependencies

The output can be quite
long as conan downloads and/or builds
zlib, expat, curl and other dependencies.| $ conan install ..
     --build missing | c:\\..\\build> conan install .. --build missing
    --profile msvc2019Release64 | | _**2**_ | Get cmake to generate
makefiles or sln/vcxproj | $ cmake .. | c:\\..\\build> cmake .. -G "Visual Studio 16 2019" | _**3**_ | Build | $ cmake --build . | c:\\..\\build> cmake --build . --config Release
You may prefer to open exiv2.sln and build using the IDE. | | _**4**_ | Optionally Run Test Suite | $ make tests | You must install MinGW
bash and python to run tests
See [README.md](README.md) | @@ -195,17 +199,17 @@ Exiv2 v0.27 can be built with VS 2008, 2010, 2012, 2013, 2015 , 2017 and 2019. Exiv2 v0.28 is being "modernised" to C++11 and will not support C++98. We don't expect Exiv2 v0.28 to build with VS versions earlier than VS 2015. -You create profiles in %HOMEPATH%\.conan\profiles with a text editor. For your convenience, you'll find profiles in `\cmake\msvc_conan_profiles`. There are 26 in total: +You create profiles in %HOMEPATH%\.conan\profiles with a text editor. For your convenience, you'll find profiles in `\cmake\msvc_conan_profiles`. ``` Profile := msvc{Edition}{Type}{Bits} Edition := { 2019 | 2017 | 2015 } Type := { Release | Debug } -Bits := { 64 | 32 } # 32 bit build is not provided for 2019 -Examples: msvc2019Release msvc2017Release64 msvc2015Debug32 +Bits := { 64 | 32 } +Examples: msvc2019Release64 msvc2017Release64 msvc2015Debug32 ``` -The profile msvc2019Release is as follows: +The profile msvc2019Release64 is as follows: ```ini [build_requires] @@ -247,8 +251,8 @@ CMake provides Generators for different editions of Visual Studio. The 64 and 3 | Architecture | Visual Studio 2019 | Visual Studio 2017 | Visual Studio 2015 | |:--------- |--------------------|--------------------|--------------------|--------------------| -| 64 bit | "Visual Studio 16 2019" | "Visual Studio 15 2017 Win64" | "Visual Studio 14 2015 Win64" | -| 32 bit | Not provided | "Visual Studio 15 2017" | "Visual Studio 14 2015" | +| 64 bit | "Visual Studio 16 2019" | "Visual Studio 15 2017 Win64" | "Visual Studio 14 2015 Win64" | +| 32 bit | "Visual Studio 16 2019" -A Win32 | "Visual Studio 15 2017" | "Visual Studio 14 2015" | ### Recommended settings for Visual Studio @@ -264,16 +268,16 @@ CMake provides Generators for different editions of Visual Studio. The 64 and 3 || Visual Studio 2019 | Visual Studio 2017 | Visual Studio 2015 | |:-------|-------|------|--------------| -| _**conan install .. --profile**_ | msvc2019Debug | msvc2017Debug64 | msvc2015Debug64 | +| _**conan install .. --profile**_ | msvc2019Debug64 | msvc2017Debug64 | msvc2015Debug64 | | _**profile**_
_ | build\_type=Debug
compiler.runtime=MDd | build\_type=Debug
compiler.runtime=MDd | build_type=Debug
compiler.runtime=MDd | ##### 32bit Builds || Visual Studio 2019 | Visual Studio 2017 | Visual Studio 2015 | |:-----------|--------------------|--------------------|--------------------| -| _**conan install .. --profile**_ | Not provided | msvc2017Release32 | msvc2015Release32 | -| _**cmake -G**_ | Not provided | "Visual Studio 15 2017" | "Visual Studio 14 2015" | -| _**profile**_
_ | Not provided | arch=x86
arch\_build=x86 | arch=x86
arch\_build=x86 | +| _**conan install .. --profile**_ | msvc2019Release32 | msvc2017Release32 | msvc2015Release32 | +| _**cmake -G**_ | "Visual Studio 15 2019" -A Win32 | "Visual Studio 15 2017" | "Visual Studio 14 2015" | +| _**profile**_
_ | arch=x86
arch\_build=x86 | arch=x86
arch\_build=x86 | arch=x86
arch\_build=x86 | ##### Static Builds @@ -589,4 +593,4 @@ $ cmake -DEXIV2_ENABLE_WEBREADY=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_ENABLE_SSH=ON [TOC](#TOC) -Written by Robin Mills
robin@clanmills.com
Updated: 2020-05-21 +Written by Robin Mills
robin@clanmills.com
Updated: 2020-11-08 diff --git a/README.md b/README.md index a79ebc48..ddc65bf8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -| Travis | AppVeyor | GitLab| Codecov| Repology| -|:-------------:|:-------------:|:-----:|:------:|:-------:| -| [![Build Status](https://travis-ci.org/Exiv2/exiv2.svg?branch=0.27-maintenance)](https://travis-ci.org/Exiv2/exiv2) | [![Build status](https://ci.appveyor.com/api/projects/status/d6vxf2n0cp3v88al/branch/0.27-maintenance?svg=true)](https://ci.appveyor.com/project/piponazo/exiv2-wutfp/branch/0.27-maintenance) | [![pipeline status](https://gitlab.com/D4N/exiv2/badges/0.27-maintenance/pipeline.svg)](https://gitlab.com/D4N/exiv2/commits/0.27-maintenance) | [![codecov](https://codecov.io/gh/Exiv2/exiv2/branch/0.27-maintenance/graph/badge.svg)](https://codecov.io/gh/Exiv2/exiv2) | [![Packaging status](https://repology.org/badge/tiny-repos/exiv2.svg)](https://repology.org/metapackage/exiv2/versions) | +| Travis | AppVeyor | GitLab| Codecov| Repology| Chat | +|:-------------:|:-------------:|:-----:|:------:|:-------:|:----:| +| [![Build Status](https://travis-ci.org/Exiv2/exiv2.svg?branch=0.27-maintenance)](https://travis-ci.org/Exiv2/exiv2) | [![Build status](https://ci.appveyor.com/api/projects/status/d6vxf2n0cp3v88al/branch/0.27-maintenance?svg=true)](https://ci.appveyor.com/project/piponazo/exiv2-wutfp/branch/0.27-maintenance) | [![pipeline status](https://gitlab.com/D4N/exiv2/badges/0.27-maintenance/pipeline.svg)](https://gitlab.com/D4N/exiv2/commits/0.27-maintenance) | [![codecov](https://codecov.io/gh/Exiv2/exiv2/branch/0.27-maintenance/graph/badge.svg)](https://codecov.io/gh/Exiv2/exiv2) | [![Packaging status](https://repology.org/badge/tiny-repos/exiv2.svg)](https://repology.org/metapackage/exiv2/versions) | [![#exiv2-chat on matrix.org](matrix-standard-vector-logo-xs.png)](https://matrix.to/#/#exiv2-chat:matrix.org) |
@@ -80,6 +80,8 @@ $ sudo make install This will install the library into the "standard locations". The library will be installed in `/usr/local/lib`, executables (including the exiv2 command-line program) in `/usr/local/bin/` and header files in `/usr/local/include/exiv2` +When you run cmake, it will generate the file exv_conf.h in the build directory. This file contains setting information about both the options you have chosen and the availability of libraries on your machine. + #### Using the exiv2 command-line program To execute the exiv2 command line program, you should update your path to search /usr/local/bin/ @@ -804,7 +806,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
### 3.2 Support -For new bug reports and feature requests, please open an issue in Github. +For new bug reports, feature requests and support: Please open an issue in Github. [https://github.com/exiv2/exiv2](https://github.com/exiv2/exiv2) [TOC](#TOC)
@@ -1298,5 +1300,5 @@ $ sudo pkg install developer/gcc-7 [TOC](#TOC) -Written by Robin Mills
robin@clanmills.com
Updated: 2020-05-25 +Written by Robin Mills
robin@clanmills.com
Updated: 2020-11-20 diff --git a/cmake/msvc_conan_profiles/msvc2019Debug32 b/cmake/msvc_conan_profiles/msvc2019Debug32 new file mode 100755 index 00000000..4825d2a4 --- /dev/null +++ b/cmake/msvc_conan_profiles/msvc2019Debug32 @@ -0,0 +1,12 @@ +[build_requires] +[settings] +arch=x86 +build_type=Debug +compiler=Visual Studio +compiler.runtime=MDd +compiler.version=16 +os=Windows +arch_build=x86 +os_build=Windows +[options] +[env] diff --git a/cmake/msvc_conan_profiles/msvc2019Release32 b/cmake/msvc_conan_profiles/msvc2019Release32 new file mode 100755 index 00000000..980594fb --- /dev/null +++ b/cmake/msvc_conan_profiles/msvc2019Release32 @@ -0,0 +1,12 @@ +[build_requires] +[settings] +arch=x86 +build_type=Release +compiler=Visual Studio +compiler.runtime=MD +compiler.version=16 +os=Windows +arch_build=x86 +os_build=Windows +[options] +[env] diff --git a/matrix-standard-vector-logo-xs.png b/matrix-standard-vector-logo-xs.png new file mode 100644 index 00000000..509ffd01 Binary files /dev/null and b/matrix-standard-vector-logo-xs.png differ