diff options
| author | Andrei Lebedev <lebdron@gmail.com> | 2019-06-12 08:25:07 +0300 |
|---|---|---|
| committer | Andrei Lebedev <lebdron@gmail.com> | 2019-06-12 08:25:07 +0300 |
| commit | 34d19da9ffd0571bf16190ec4a16a04bef265900 (patch) | |
| tree | 413690269c5f216194b9a0f72f0438b27ccfd68d /ports/zxing-cpp | |
| parent | b395438c791ca9f78e383a1d571525eee785e67c (diff) | |
| parent | 59a8a9c6248ed230b19028a44484ae5f06db697d (diff) | |
| download | vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.tar.gz vcpkg-34d19da9ffd0571bf16190ec4a16a04bef265900.zip | |
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'ports/zxing-cpp')
| -rw-r--r-- | ports/zxing-cpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/zxing-cpp/portfile.cmake | 14 |
2 files changed, 8 insertions, 8 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 06a2e6b49..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) -if (WIN32) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing) -else(WIN32) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing) -endif(WIN32) -vcpkg_copy_tool_dependencies(${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-cpp) +else() + file(COPY ${CURRENT_PACKAGES_DIR}/bin/zxing DESTINATION ${CURRENT_PACKAGES_DIR}/tools/zxing-cpp) +endif() +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/zxing-cpp) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) |