Skip to content

Commit

Permalink
Use the official exiv2 version on macOS
Browse files Browse the repository at this point in the history
It appears to have been updated to 0.28.1, which is not fully compatible
with 0.28.0 due to the change to the exported library target.
  • Loading branch information
10110111 committed Nov 28, 2023
1 parent 19636bb commit 610970f
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 18 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/ci-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,8 @@ jobs:
steps:
- name: Install dependencies
run: |
brew install inih # XXX: this should be put into dependencies in exiv2 formula
cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/e/
sed -e 's@0\.27\[email protected]@g' -e 's@4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6@89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d@g' exiv2.rb > exiv2.rb-
mv exiv2.rb- exiv2.rb
cd -
export HOMEBREW_NO_INSTALL_FROM_API=1
brew install --build-from-source exiv2
brew install qt@6 nlopt
brew update
brew install qt@6 nlopt exiv2
- name: Checkout repository
uses: actions/checkout@v3
Expand Down
11 changes: 2 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,8 @@ jobs:
steps:
- name: Install dependencies
run: |
cat /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/e/exiv2.rb # temporary, for debugging
brew install inih # XXX: this should be put into dependencies in exiv2 formula
cd /usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/e/
sed -e 's@0\.27\[email protected]@g' -e 's@4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6@89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d@g' exiv2.rb > exiv2.rb-
mv exiv2.rb- exiv2.rb
cd -
export HOMEBREW_NO_INSTALL_FROM_API=1
brew install --build-from-source exiv2
brew install qt@5 nlopt
brew update
brew install qt@5 nlopt exiv2
- name: Checkout repository
uses: actions/checkout@v3
Expand Down
6 changes: 5 additions & 1 deletion plugins/LensDistortionEstimator/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ SET_TARGET_PROPERTIES(LensDistortionEstimator-static PROPERTIES COMPILE_FLAGS "-
if(exiv2_FOUND)
MESSAGE(STATUS "Found exiv2 ${exiv2_VERSION_MAJOR}.${exiv2_VERSION_MINOR}.${exiv2_VERSION_PATCH}")
TARGET_COMPILE_OPTIONS(LensDistortionEstimator-static PRIVATE "-DHAVE_EXIV2")
TARGET_LINK_LIBRARIES(LensDistortionEstimator-static exiv2lib)
IF(${exiv2_VERSION_MAJOR}.${exiv2_VERSION_MINOR}.${exiv2_VERSION_PATCH} VERSION_GREATER_EQUAL 0.28.1)
TARGET_LINK_LIBRARIES(LensDistortionEstimator-static Exiv2::exiv2lib)
ELSE()
TARGET_LINK_LIBRARIES(LensDistortionEstimator-static exiv2lib)
ENDIF()
endif()

TARGET_COMPILE_OPTIONS(LensDistortionEstimator-static PRIVATE "-DHAVE_NLOPT")
Expand Down

0 comments on commit 610970f

Please sign in to comment.