[libdmtx] Correct all errors encountered during of #44636 (#44657)

Co-authored-by: WangWeiLin-MV <156736127+WangWeiLin-MV@users.noreply.github.com>
This commit is contained in:
Nicolas BLANC 2025-04-01 09:23:18 +02:00 committed by GitHub
parent 5eda7b2b7a
commit fbef4f47f8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 19 additions and 30 deletions

View File

@ -8,23 +8,14 @@ index 6420a813c1..749bd8d680 100644
project(DMTX VERSION 0.7.5 LANGUAGES C)
# DMTX library
@@ -26,3 +26,19 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
@@ -26,3 +26,10 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
add_subdirectory("test")
endif()
endif()
+
+# Add install rules
+if(DMTX_SHARED)
+ if(WIN32)
+ install(TARGETS dmtx
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION lib)
+ else()
+ install(TARGETS dmtx
+ LIBRARY DESTINATION lib)
+ endif()
+else()
+ install(TARGETS dmtx
+ ARCHIVE DESTINATION lib)
+endif()
+install(FILES "dmtx.h" "dmtxstatic.h" DESTINATION include)
+install(TARGETS dmtx
+ RUNTIME DESTINATION bin
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib)
+install(FILES "dmtx.h" DESTINATION include)

View File

@ -1,28 +1,20 @@
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/dmtx/libdmtx/archive/refs/tags/v0.7.7.tar.gz"
FILENAME "v0.7.7.tar.gz"
SHA512 802a697669afeb74da0cc3736fe7301fcc1653c1e3bebc343a8baf76e52226cc5509231519343267a92e22ebdfcc5b2825380339991340f054f0a6685d2ffcdc
)
vcpkg_extract_source_archive_ex(
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE "${ARCHIVE}"
REPO dmtx/libdmtx
REF v${VERSION}
SHA512 802a697669afeb74da0cc3736fe7301fcc1653c1e3bebc343a8baf76e52226cc5509231519343267a92e22ebdfcc5b2825380339991340f054f0a6685d2ffcdc
PATCHES
001-cmake-add-install-target.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
..
OPTIONS_DEBUG
-DBUILD_TESTING=ON
)
set(VCPKG_POLICY_ALLOW_DEBUG_INCLUDE enabled)
vcpkg_cmake_install()
vcpkg_copy_pdbs()
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

View File

@ -1,6 +1,7 @@
{
"name": "libdmtx",
"version": "0.7.7",
"port-version": 1,
"description": "Software library that enables programs to read and write Data Matrix barcodes of the modern ECC200 variety",
"homepage": "https://github.com/dmtx/libdmtx",
"license": "BSD-2-Clause",

View File

@ -4522,7 +4522,7 @@
},
"libdmtx": {
"baseline": "0.7.7",
"port-version": 0
"port-version": 1
},
"libdmx": {
"baseline": "1.1.5",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "83a83dba48ce7d0cd1d96808eac90a50a7c2d472",
"version": "0.7.7",
"port-version": 1
},
{
"git-tree": "2355c6d9951b9b34be9cbef758b59cb074067206",
"version": "0.7.7",