diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-08-31 22:36:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-31 22:36:25 -0700 |
| commit | 46e25a10d7295d3bc107d6f51ce0e2851877f393 (patch) | |
| tree | eaceaf631ad478dbdc584332a7541cd40bc22449 /ports/tensorflow-cc | |
| parent | cdd4a988fdf867d3c6dba43fd3924c5188de18bd (diff) | |
| download | vcpkg-46e25a10d7295d3bc107d6f51ce0e2851877f393.tar.gz vcpkg-46e25a10d7295d3bc107d6f51ce0e2851877f393.zip | |
[vcpkg] Replace uses of msys pacman.exe with direct package downloads (#13019)
* wip
Apply suggestions from code review
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
* [vcpkg_acquire_msys] Trim list of packages. Introduce defaults.
* [behaviortree-cpp] Fix dynamic dependency on ZMQ
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Diffstat (limited to 'ports/tensorflow-cc')
| -rw-r--r-- | ports/tensorflow-cc/CONTROL | 2 | ||||
| -rw-r--r-- | ports/tensorflow-cc/portfile.cmake | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/ports/tensorflow-cc/CONTROL b/ports/tensorflow-cc/CONTROL index 6fa024164..2d0ff5007 100644 --- a/ports/tensorflow-cc/CONTROL +++ b/ports/tensorflow-cc/CONTROL @@ -1,6 +1,6 @@ Source: tensorflow-cc Version: 1.14 -Port-Version: 4 +Port-Version: 5 Description: Library for computation using data flow graphs for scalable machine learning Build-Depends: c-ares Supports: !x86 diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake index fdd95307c..0aa53e7ae 100644 --- a/ports/tensorflow-cc/portfile.cmake +++ b/ports/tensorflow-cc/portfile.cmake @@ -26,22 +26,21 @@ get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path(PREPEND ${PYTHON3_DIR}) set(ENV{PYTHON_BIN_PATH} "${PYTHON3}") +vcpkg_find_acquire_program(GIT) +get_filename_component(GIT_DIR "${GIT}" DIRECTORY) +vcpkg_add_to_path(PREPEND ${GIT_DIR}) + function(tensorflow_try_remove_recurse_wait PATH_TO_REMOVE) file(REMOVE_RECURSE ${PATH_TO_REMOVE}) if (EXISTS "${PATH_TO_REMOVE}") - execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5) + _execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 5) file(REMOVE_RECURSE ${PATH_TO_REMOVE}) endif() endfunction() -# we currently only support the release version -tensorflow_try_remove_recurse_wait(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) -file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) -file(GLOB SOURCES ${SOURCE_PATH}/*) -file(COPY ${SOURCES} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) - if(CMAKE_HOST_WIN32) - vcpkg_acquire_msys(MSYS_ROOT PACKAGES unzip patch diffutils git) + vcpkg_acquire_msys(MSYS_ROOT PACKAGES bash unzip patch diffutils libintl gzip coreutils) + vcpkg_add_to_path(${MSYS_ROOT}/usr/bin) set(BASH ${MSYS_ROOT}/usr/bin/bash.exe) set(ENV{BAZEL_SH} ${MSYS_ROOT}/usr/bin/bash.exe) @@ -50,6 +49,11 @@ if(CMAKE_HOST_WIN32) set(ENV{BAZEL_VC_FULL_VERSION} $ENV{VCToolsVersion}) endif() +# we currently only support the release version +tensorflow_try_remove_recurse_wait(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) +file(RENAME ${SOURCE_PATH} ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) +set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") + # tensorflow has long file names, which will not work on windows set(ENV{TEST_TMPDIR} ${CURRENT_BUILDTREES_DIR}/../.bzl) |