blumia/pineapple-pictures
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(CI): macOS and Ubuntu CI FTBFS

Browse Source 
macOS's CI uses conan to build exiv2, which seems still rely on
the exiv2lib target...
This commit is contained in:
Gary Wang 2025-05-24 23:19:26 +08:00
parent 24a0b581f3
commit 291a98ea97
No known key found for this signature in database
GPG Key ID: 5D30A4F15EA78760
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ubuntu.yml vendored
View File

@ -15,7 +15,7 @@ jobs:
run: | run: |
mkdir build mkdir build
cd build cd build
cmake ../ -DPREFER_QT_5=OFF cmake ../
make make
cpack -G DEB cpack -G DEB
- name: Try install it - name: Try install it

4
CMakeLists.txt
View File

@ -121,6 +121,10 @@ target_sources(${EXE_NAME} PRIVATE ${PPIC_QM_FILES})
target_link_libraries (${EXE_NAME} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Svg Qt${QT_VERSION_MAJOR}::SvgWidgets) target_link_libraries (${EXE_NAME} Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Svg Qt${QT_VERSION_MAJOR}::SvgWidgets)
if (exiv2_FOUND) if (exiv2_FOUND)
if(NOT TARGET Exiv2::exiv2lib AND TARGET exiv2lib)
# for exiv2 0.27.x and (macOS?) conan build
add_library(Exiv2::exiv2lib ALIAS exiv2lib)
endif()
target_link_libraries (${EXE_NAME} target_link_libraries (${EXE_NAME}
Exiv2::exiv2lib Exiv2::exiv2lib
) )