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

don't compile WIN32 stuff when iconv is present #2575

Merged
merged 1 commit into from
Apr 4, 2023
Merged

Conversation

neheb
Copy link
Collaborator

@neheb neheb commented Apr 3, 2023

MinGW has iconv, so this block of code can go away.

MinGW has iconv, so this block of code can go away.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
@codecov
Copy link

codecov bot commented Apr 3, 2023

Codecov Report

Merging #2575 (7cd77c5) into main (3633f8d) will not change coverage.
The diff coverage is 66.66%.

@@           Coverage Diff           @@
##             main    #2575   +/-   ##
=======================================
  Coverage   63.93%   63.93%           
=======================================
  Files         103      103           
  Lines       22381    22381           
  Branches    10823    10823           
=======================================
  Hits        14309    14309           
  Misses       5851     5851           
  Partials     2221     2221           
Impacted Files Coverage Δ
src/convert.cpp 52.50% <66.66%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@kmilos
Copy link
Collaborator

kmilos commented Apr 4, 2023

MinGW (i.e. MSYS2) does, but not obvious for MSVC... It is indeed available through vcpkg or Conan, do we require it now? Maybe update README as well?

@neheb
Copy link
Collaborator Author

neheb commented Apr 4, 2023

No this PR just builds one or the other on Windows.

@neheb neheb merged commit 9322f13 into Exiv2:main Apr 4, 2023
@neheb neheb deleted the ccvt branch April 4, 2023 13:58
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