diff --git a/ports/libdmtx/001-cmake-add-install-target.patch b/ports/libdmtx/001-cmake-add-install-target.patch deleted file mode 100644 index 0602d1b3e3..0000000000 --- a/ports/libdmtx/001-cmake-add-install-target.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6420a813c1..749bd8d680 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.0) -+cmake_minimum_required(VERSION 3.5) - project(DMTX VERSION 0.7.5 LANGUAGES C) - - # DMTX library -@@ -26,3 +26,10 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) - add_subdirectory("test") - endif() - endif() -+ -+# Add install rules -+install(TARGETS dmtx -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) -+install(FILES "dmtx.h" DESTINATION include) diff --git a/ports/libdmtx/portfile.cmake b/ports/libdmtx/portfile.cmake index ce2711b9d1..21fd1bb454 100644 --- a/ports/libdmtx/portfile.cmake +++ b/ports/libdmtx/portfile.cmake @@ -2,13 +2,17 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO dmtx/libdmtx REF v${VERSION} - SHA512 802a697669afeb74da0cc3736fe7301fcc1653c1e3bebc343a8baf76e52226cc5509231519343267a92e22ebdfcc5b2825380339991340f054f0a6685d2ffcdc - PATCHES - 001-cmake-add-install-target.patch + SHA512 2796b2a43d2e83732bd9e9c3d4c702c3b40f55453713d968cf8927534952af3891c8e1f650650e4d47e9c58f50b23f43e2653e2b9ea474359a00dcd097b6bf00 ) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" DMTX_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" DMTX_STATIC) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DDMTX_SHARED=${DMTX_SHARED} + -DDMTX_STATIC=${DMTX_STATIC} ) vcpkg_cmake_install() diff --git a/ports/libdmtx/vcpkg.json b/ports/libdmtx/vcpkg.json index 3f2e793824..1ae9e09347 100644 --- a/ports/libdmtx/vcpkg.json +++ b/ports/libdmtx/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libdmtx", - "version": "0.7.7", - "port-version": 1, + "version": "0.7.8", "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", diff --git a/versions/baseline.json b/versions/baseline.json index 62d6688ea5..ddb2ee0a7e 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4897,8 +4897,8 @@ "port-version": 1 }, "libdmtx": { - "baseline": "0.7.7", - "port-version": 1 + "baseline": "0.7.8", + "port-version": 0 }, "libdmx": { "baseline": "1.1.5", diff --git a/versions/l-/libdmtx.json b/versions/l-/libdmtx.json index 74a645daf9..b437bebcf6 100644 --- a/versions/l-/libdmtx.json +++ b/versions/l-/libdmtx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "98b487a6572b773b9803366aabc2c9b349cedf80", + "version": "0.7.8", + "port-version": 0 + }, { "git-tree": "83a83dba48ce7d0cd1d96808eac90a50a7c2d472", "version": "0.7.7",