diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-06-06 18:08:49 -0700 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-06-06 18:08:49 -0700 |
| commit | cef7f8b5a68ed4903abce0378d7e7864c411af47 (patch) | |
| tree | 040e97853dc691af7a4d30aa264ab9e087fd1df9 /ports/zxing-cpp | |
| parent | 45e57f319657222eda39891fba73cb51b2cf3469 (diff) | |
| parent | da6d601d1c2161a455de0e572000633316962003 (diff) | |
| download | vcpkg-cef7f8b5a68ed4903abce0378d7e7864c411af47.tar.gz vcpkg-cef7f8b5a68ed4903abce0378d7e7864c411af47.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into add_libraqm
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) |