aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hasper <seral@hasper.info>2019-06-06 20:52:02 +0200
committerPhil Christensen <philc@microsoft.com>2019-06-06 11:52:02 -0700
commit4c613a085ce819200b9d2f4da85da530ef08201c (patch)
tree080adaa62c5b942dbbe3ab3f037e6e1fd34fedc0
parentf6f127eb00fb6b5d43d307bec01e02da570b0631 (diff)
downloadvcpkg-4c613a085ce819200b9d2f4da85da530ef08201c.tar.gz
vcpkg-4c613a085ce819200b9d2f4da85da530ef08201c.zip
[zxing-cpp] Fixed renaming zxing -> zxing-cpp (#6779)
Referenced file vcpkg/installed/x64-windows/tools/zxing-cpp/zxing.exe did not exist, because it was created at vcpkg/installed/x64-windows/tools/zxing/zxing.exe Closes #6616
-rw-r--r--ports/zxing-cpp/CONTROL2
-rw-r--r--ports/zxing-cpp/portfile.cmake8
2 files changed, 5 insertions, 5 deletions
diff --git a/ports/zxing-cpp/CONTROL b/ports/zxing-cpp/CONTROL
index fec8e63e5..c51ccb60d 100644
--- a/ports/zxing-cpp/CONTROL
+++ b/ports/zxing-cpp/CONTROL
@@ -1,4 +1,4 @@
Source: zxing-cpp
-Version: 3.3.3-3
+Version: 3.3.3-4
Build-Depends: opencv[core]
Description: Barcode detection and decoding library.
diff --git a/ports/zxing-cpp/portfile.cmake b/ports/zxing-cpp/portfile.cmake
index 40f1aca5b..1d063de7c 100644
--- a/ports/zxing-cpp/portfile.cmake
+++ b/ports/zxing-cpp/portfile.cmake
@@ -22,13 +22,13 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/zxing/cmake" TARGET_PATH share/zxing)
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/zxing)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/zxing-cpp)
if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
- file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing)
+ file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing-cpp)
else()
- file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing)
+ file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing-cpp)
endif()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/zxing)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/zxing-cpp)
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)