root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2025-02-21 18:40:50 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: root:b2ff37b3a2caf672481f4b46dac4889e638bd84a
Branches Tags
root:master
root:gh-pages
root:4.1
root:4.0
root:3.2
root:3.1
root:3.0
root:2.6
root:2.5
root:2.4
root:2.3
root:2.2
root:2.1
root:2.0
root:1.4
root:1.3
root:1.2
root:1.1
root:1.0
...
compare: root:caf0a29b74a586e2a18c8b249283888859e079a1
Branches Tags
root:master
root:gh-pages
root:4.1
root:4.0
root:3.2
root:3.1
root:3.0
root:2.6
root:2.5
root:2.4
root:2.3
root:2.2
root:2.1
root:2.0
root:1.4
root:1.3
root:1.2
root:1.1
root:1.0

4 Commits
b2ff37b3a2 ... caf0a29b74

Author SHA1 Message Date
Martin Tůma
caf0a29b74 Added missing pkgconf package 2025-01-05 13:21:53 +01:00
Martin Tůma
4653525da8 Added build option to link using PKGCONFIG 2025-01-05 12:18:55 +01:00
Martin Tůma
cc2b03423b Fixed lib name 2025-01-05 10:08:02 +01:00
Martin Tůma
e21629f021 Link abseil on Windows if required by protobuf 2025-01-05 08:33:04 +01:00
2 changed files with 27 additions and 13 deletions
Show Stats Expand all files Collapse all files

3
.appveyor.yml
View File

@ -16,13 +16,14 @@ install:
- cmd: |- - cmd: |-
set PATH=%QTDIR%\bin;%VCPKGDIR%\tools\protobuf;%PATH% set PATH=%QTDIR%\bin;%VCPKGDIR%\tools\protobuf;%PATH%
call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat call "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat
vcpkg install pkgconf:x64-windows-static-md-release
vcpkg install protobuf:x64-windows-static-md-release vcpkg install protobuf:x64-windows-static-md-release
vcpkg install zlib:x64-windows-static-md-release vcpkg install zlib:x64-windows-static-md-release
copy /y %VCPKGDIR%\lib\zlib.lib %VCPKGDIR%\lib\zlibstatic.lib copy /y %VCPKGDIR%\lib\zlib.lib %VCPKGDIR%\lib\zlibstatic.lib
build_script: build_script:
- cmd: |- - cmd: |-
qmake PROTOBUF=%VCPKGDIR% ZLIB=%VCPKGDIR% pbfplugin.pro qmake USE_PKGCONFIG=true pbfplugin.pro
nmake release nmake release
artifacts: artifacts:

37
pbfplugin.pro
View File

@ -39,32 +39,45 @@ RESOURCES += pbfplugin.qrc
DEFINES += QT_NO_DEPRECATED_WARNINGS DEFINES += QT_NO_DEPRECATED_WARNINGS
equals(USE_PKGCONFIG, "true") {
CONFIG += link_pkgconfig
PKGCONFIG += protobuf-lite zlib
}
unix:!macx:!android { unix:!macx:!android {
LIBS += -lprotobuf-lite \ !equals(USE_PKGCONFIG, "true") {
-lz LIBS += -lprotobuf-lite \
-lz
}
target.path += $$[QT_INSTALL_PLUGINS]/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats
INSTALLS += target INSTALLS += target
} }
win32 { win32 {
INCLUDEPATH += $$PROTOBUF/include \ !equals(USE_PKGCONFIG, "true") {
$$ZLIB/include INCLUDEPATH += $$PROTOBUF/include \
LIBS += $$PROTOBUF/lib/libprotobuf-lite.lib \ $$ZLIB/include
$$ZLIB/lib/zlibstatic.lib LIBS += $$PROTOBUF/lib/libprotobuf-lite.lib \
$$ZLIB/lib/zlibstatic.lib
}
QMAKE_TARGET_PRODUCT = QtPBFImagePlugin QMAKE_TARGET_PRODUCT = QtPBFImagePlugin
QMAKE_TARGET_DESCRIPTION = Qt $$QT_VERSION MVT/PBF image plugin QMAKE_TARGET_DESCRIPTION = Qt $$QT_VERSION MVT/PBF image plugin
QMAKE_TARGET_COPYRIGHT = Copyright (c) 2018-2025 Martin Tuma QMAKE_TARGET_COPYRIGHT = Copyright (c) 2018-2025 Martin Tuma
} }
macx { macx {
INCLUDEPATH += $$PROTOBUF/include !equals(USE_PKGCONFIG, "true") {
LIBS += $$PROTOBUF/lib/libprotobuf-lite.a \ INCLUDEPATH += $$PROTOBUF/include
-lz LIBS += $$PROTOBUF/lib/libprotobuf-lite.a \
-lz
}
} }
android { android {
INCLUDEPATH += $$PROTOBUF/include !equals(USE_PKGCONFIG, "true") {
LIBS += $$PROTOBUF/$$ANDROID_TARGET_ARCH/libprotobuf-lite.a \ INCLUDEPATH += $$PROTOBUF/include
-lz LIBS += $$PROTOBUF/$$ANDROID_TARGET_ARCH/libprotobuf-lite.a \
-lz
}
top_builddir=$$shadowed($$PWD) top_builddir=$$shadowed($$PWD)
DESTDIR = $$top_builddir/plugins DESTDIR = $$top_builddir/plugins