mirror of https://github.com/microsoft/vcpkg.git
[zint] Update to 2.12.0 (#28443)
This commit is contained in:
parent
a22a711815
commit
22eea5c469
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
|
||||
index 854674d..d62176b 100644
|
||||
--- a/backend/CMakeLists.txt
|
||||
+++ b/backend/CMakeLists.txt
|
||||
@@ -13,7 +13,7 @@ set(zint_TWODIM_SRCS code16k.c codablock.c dmatrix.c pdf417.c qr.c maxicode.c co
|
||||
set(zint_OUTPUT_SRCS vector.c ps.c svg.c emf.c bmp.c pcx.c gif.c png.c tif.c raster.c output.c)
|
||||
set(zint_SRCS ${zint_OUTPUT_SRCS} ${zint_COMMON_SRCS} ${zint_ONEDIM_SRCS} ${zint_POSTAL_SRCS} ${zint_TWODIM_SRCS})
|
||||
|
||||
-add_library(zint SHARED ${zint_SRCS})
|
||||
+add_library(zint ${zint_SRCS})
|
||||
|
||||
if(WIN32)
|
||||
target_sources(${PROJECT_NAME} PRIVATE libzint.rc)
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
|
||||
index 854674d..f61a294 100644
|
||||
--- a/backend/CMakeLists.txt
|
||||
+++ b/backend/CMakeLists.txt
|
||||
@@ -47,7 +47,7 @@ endif()
|
||||
if(ZINT_USE_PNG AND PNG_FOUND)
|
||||
zint_target_link_libraries(PNG::PNG)
|
||||
else()
|
||||
- zint_target_compile_definitions(PUBLIC NO_PNG)
|
||||
+ zint_target_compile_definitions(PRIVATE NO_PNG)
|
||||
endif()
|
||||
|
||||
if(ZINT_TEST)
|
||||
@@ -63,7 +63,13 @@ if(MSVC)
|
||||
target_compile_definitions(zint PRIVATE DLL_EXPORT)
|
||||
endif()
|
||||
|
||||
-install(TARGETS zint ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
+target_include_directories(zint PUBLIC
|
||||
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
||||
+ $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
|
||||
+)
|
||||
+
|
||||
+install(TARGETS zint EXPORT unofficial-zint-targets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
+install(EXPORT unofficial-zint-targets NAMESPACE unofficial::zint:: DESTINATION share/unofficial-zint)
|
||||
if(ZINT_STATIC)
|
||||
install(TARGETS zint-static ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
endif()
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
|
||||
index 854674d..c9d7627 100644
|
||||
--- a/backend/CMakeLists.txt
|
||||
+++ b/backend/CMakeLists.txt
|
||||
@@ -4,8 +4,6 @@
|
||||
|
||||
project(zint)
|
||||
|
||||
-configure_file(zintconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/zintconfig.h)
|
||||
-
|
||||
set(zint_COMMON_SRCS common.c library.c large.c reedsol.c gs1.c eci.c general_field.c)
|
||||
set(zint_ONEDIM_SRCS bc412.c code.c code128.c 2of5.c upcean.c telepen.c medical.c plessey.c rss.c)
|
||||
set(zint_POSTAL_SRCS postal.c auspost.c imail.c mailmark.c)
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
|
||||
index d779033..133abef 100644
|
||||
--- a/backend/CMakeLists.txt
|
||||
+++ b/backend/CMakeLists.txt
|
||||
@@ -80,7 +80,9 @@ if(NOT MSVC)
|
||||
endif()
|
||||
|
||||
if(MSVC)
|
||||
- target_compile_definitions(zint PRIVATE DLL_EXPORT)
|
||||
+ if(ZINT_SHARED)
|
||||
+ target_compile_definitions(zint PRIVATE DLL_EXPORT)
|
||||
+ endif()
|
||||
endif()
|
||||
|
||||
zint_target_include_directories(PUBLIC
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt
|
||||
index 133abef..a95f620 100644
|
||||
--- a/backend/CMakeLists.txt
|
||||
+++ b/backend/CMakeLists.txt
|
||||
@@ -46,12 +46,12 @@ function(zint_target_compile_definitions scope definition)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
-function(zint_target_include_directories scope directory)
|
||||
+function(zint_target_include_directories)
|
||||
if(ZINT_SHARED)
|
||||
- target_include_directories(zint ${scope} ${directory})
|
||||
+ target_include_directories(zint ${ARGN})
|
||||
endif()
|
||||
if(ZINT_STATIC)
|
||||
- target_include_directories(zint-static ${scope} ${directory})
|
||||
+ target_include_directories(zint-static ${ARGN})
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
|
|
@ -1,13 +1,12 @@
|
|||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO zint/zint
|
||||
REF 2.11.1
|
||||
SHA512 21dbe5dc99b46f79ac1a819fd4e20de22bee8928da5f6b4883a0767243a8633c65f559ac60328dcd70b75a90438c0047c31c6ace1a10750a2579042f54aa801b
|
||||
REF 2.12.0
|
||||
SHA512 398502efc1f07718e7c86a1e91f6e94c88b7f7c5e3c59fd507f3a5966488f4b0bb230ae9696515583aa536e2357c9a6295be7de6b4bc83daf5b4eb3be5e69b24
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
0001-fix-static-lib.patch
|
||||
0002-install-export.patch
|
||||
0003-fix-parallel-configure.patch
|
||||
0004-windows-static-build.patch
|
||||
0005-export-include-directories.patch
|
||||
)
|
||||
|
||||
vcpkg_check_features(
|
||||
|
|
@ -16,16 +15,21 @@ vcpkg_check_features(
|
|||
png ZINT_USE_PNG
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ZINT_STATIC)
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ZINT_SHARED)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
${FEATURE_OPTIONS}
|
||||
-DZINT_STATIC=${ZINT_STATIC}
|
||||
-DZINT_SHARED=${ZINT_SHARED}
|
||||
-DZINT_USE_QT=OFF
|
||||
-DZINT_TEST=OFF
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-zint)
|
||||
vcpkg_cmake_config_fixup()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
vcpkg_copy_tools(TOOL_NAMES zint AUTO_CLEAN)
|
||||
|
|
@ -35,10 +39,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
|
|||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man")
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/apps")
|
||||
|
||||
configure_file(
|
||||
"${CMAKE_CURRENT_LIST_DIR}/unofficial-zint-config.cmake.in"
|
||||
"${CURRENT_PACKAGES_DIR}/share/unofficial-zint/unofficial-zint-config.cmake"
|
||||
@ONLY
|
||||
)
|
||||
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
if(@ZINT_USE_PNG@)
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(PNG)
|
||||
endif()
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/unofficial-zint-targets.cmake")
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "zint",
|
||||
"version": "2.11.1",
|
||||
"version": "2.12.0",
|
||||
"description": "A barcode encoding library supporting over 50 symbologies",
|
||||
"homepage": "https://github.com/zint/zint",
|
||||
"license": null,
|
||||
|
|
|
|||
|
|
@ -8309,7 +8309,7 @@
|
|||
"port-version": 3
|
||||
},
|
||||
"zint": {
|
||||
"baseline": "2.11.1",
|
||||
"baseline": "2.12.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"zkpp": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "70662dabd6b07aaa376385d94a20fb2b979f8ae0",
|
||||
"version": "2.12.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "4877dc23ac1534d68383a3297eb1c44560a4d1e5",
|
||||
"version": "2.11.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue