Skip to content

Commit

Permalink
[zxing-cpp] Fixed renaming zxing -> zxing-cpp (#6779)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
PhilLab authored and Rastaban committed Jun 6, 2019
1 parent f6f127e commit 4c613a0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion 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.
8 changes: 4 additions & 4 deletions ports/zxing-cpp/portfile.cmake
Expand Up @@ -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)
Expand Down

0 comments on commit 4c613a0

Please sign in to comment.