From 743bec775a0026b8d63e36dca20a54f10038ec5a Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Tue, 20 Aug 2019 17:34:18 +0200
Subject: make find_library useable without errors to console. (#7773)

---
 scripts/cmake/vcpkg_common_definitions.cmake | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake
index 9724a33dc..2e4f5f130 100644
--- a/scripts/cmake/vcpkg_common_definitions.cmake
+++ b/scripts/cmake/vcpkg_common_definitions.cmake
@@ -49,5 +49,7 @@ set(CMAKE_STATIC_LIBRARY_SUFFIX ${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX})
 set(CMAKE_SHARED_LIBRARY_SUFFIX ${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX})
 set(CMAKE_STATIC_LIBRARY_PREFIX ${VCPKG_TARGET_STATIC_LIBRARY_PREFIX})
 set(CMAKE_SHARED_LIBRARY_PREFIX ${VCPKG_TARGET_SHARED_LIBRARY_PREFIX})
+set(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_STATIC_LIBRARY_SUFFIX};${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") # Required by find_library
+set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_STATIC_LIBRARY_PREFIX};${CMAKE_SHARED_LIBRARY_PREFIX}" CACHE INTERNAL "") # Required by find_library
 
 
-- 
cgit v1.2.3


From 4da95d667c8600c80b4b5731631ebb7bcbc91f1b Mon Sep 17 00:00:00 2001
From: Curtis J Bezault <curtbezault@gmail.com>
Date: Tue, 20 Aug 2019 08:47:26 -0700
Subject: [vcpkg]Port toolchains (#7687)

* checkpoint commit

* Only set VCPKG_ENV_OVERRIDES_FILE if it exists

* First pass at working port-toolchain

* Update VERSION.txt

* Return rvalue

* Fix compilation error

* Some fixes are requested by @ubsan

* Fix another compilation error
---
 scripts/get_triplet_environment.cmake |  4 ++--
 scripts/ports.cmake                   | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake
index 0457cee9b..3b0b9fbef 100644
--- a/scripts/get_triplet_environment.cmake
+++ b/scripts/get_triplet_environment.cmake
@@ -1,6 +1,6 @@
 include(${CMAKE_TRIPLET_FILE})
-if (DEFINED CMAKE_ENV_OVERRIDES_FILE)
-    include(${CMAKE_ENV_OVERRIDES_FILE} OPTIONAL)
+if (DEFINED VCPKG_ENV_OVERRIDES_FILE)
+    include(${VCPKG_ENV_OVERRIDES_FILE})
 endif()
 
 # GUID used as a flag - "cut here line"
diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 86b2719d5..7130825e2 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -67,7 +67,16 @@ if(CMD MATCHES "^BUILD$")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})
 
     include(${CMAKE_TRIPLET_FILE})
-    include(${ENV_OVERRIDES_FILE} OPTIONAL)
+
+    if (DEFINED VCPKG_ENV_OVERRIDES_FILE)
+        include(${VCPKG_ENV_OVERRIDES_FILE})
+    endif()
+
+    if (DEFINED VCPKG_PORT_TOOLCHAINS)
+        foreach(VCPKG_PORT_TOOLCHAIN ${VCPKG_PORT_TOOLCHAINS})
+            include(${VCPKG_PORT_TOOLCHAIN})
+        endforeach()
+    endif()
 
     set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE})
     include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_definitions.cmake)
-- 
cgit v1.2.3


From 0433989bad71f765a17c60d81d4093148ed547c6 Mon Sep 17 00:00:00 2001
From: dan-shaw <51385773+dan-shaw@users.noreply.github.com>
Date: Tue, 20 Aug 2019 12:13:26 -0700
Subject: [tensorflow] add new port for linux (#7568)

* [+] Add tensorflow-cc port (Linux only)

* [~] Refactor installation of tensorflow/external

  1. Install tensorflow/external to tensorflow-etc/external;
  2. Fix TensorflowCCConfig.cmake accordingly.

* [tensorflow] Work in progress

* fix tensorflow linux config

* [tensorflow] partial support for windows

* fix config paths

* use environmental variables instead

* remove files

* add python_path

* add verbose error messages

* review fixes

* [tensorflow] refactor config file

* minor changes

* set arch for CI
---
 scripts/cmake/vcpkg_find_acquire_program.cmake | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 84ebdbfa8..fed016c7b 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -45,6 +45,7 @@ function(vcpkg_find_acquire_program VAR)
   unset(_vfa_RENAME)
   unset(SUBDIR)
   unset(REQUIRED_INTERPRETER)
+  unset(_vfa_SUPPORTED)
   unset(POST_INSTALL_COMMAND)
 
   vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS)
@@ -231,6 +232,23 @@ function(vcpkg_find_acquire_program VAR)
     set(URL "http://doxygen.nl/files/doxygen-1.8.15.windows.bin.zip")
     set(ARCHIVE "doxygen-1.8.15.windows.bin.zip")
     set(HASH 89482dcb1863d381d47812c985593e736d703931d49994e09c7c03ef67e064115d0222b8de1563a7930404c9bc2d3be323f3d13a01ef18861be584db3d5a953c)
+  elseif(VAR MATCHES "BAZEL")
+    set(PROGNAME bazel)
+    set(BAZEL_VERSION 0.25.2)
+    set(SUBDIR ${BAZEL_VERSION})
+    set(PATHS ${DOWNLOADS}/tools/bazel/${SUBDIR})
+    set(_vfa_RENAME "bazel")
+    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
+      set(_vfa_SUPPORTED ON)
+      set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-x86_64")
+      set(ARCHIVE "bazel-${BAZEL_VERSION}-linux-x86_64")
+      set(NOEXTRACT ON)
+      set(HASH db4a583cf2996aeb29fd008261b12fe39a4a5faf0fbf96f7124e6d3ffeccf6d9655d391378e68dd0915bc91c9e146a51fd9661963743857ca25179547feceab1)
+    else()
+      set(URL "https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.zip") 
+      set(ARCHIVE "bazel-${BAZEL_VERSION}-windows-x86_64.zip")
+      set(HASH 6482f99a0896f55ef65739e7b53452fd9c0adf597b599d0022a5e0c5fa4374f4a958d46f98e8ba25af4b065adacc578bfedced483d8c169ea5cb1777a99eea53)
+    endif()
   # Download Tools
   elseif(VAR MATCHES "ARIA2")
     set(PROGNAME aria2c)
@@ -254,7 +272,7 @@ function(vcpkg_find_acquire_program VAR)
 
   do_find()
   if("${${VAR}}" MATCHES "-NOTFOUND")
-    if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
+    if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows" AND NOT _vfa_SUPPORTED)
       set(EXAMPLE ".")
       if(DEFINED BREW_PACKAGE_NAME AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
         set(EXAMPLE ":\n    brew install ${BREW_PACKAGE_NAME}")
@@ -274,9 +292,9 @@ function(vcpkg_find_acquire_program VAR)
     file(MAKE_DIRECTORY ${PROG_PATH_SUBDIR})
     if(DEFINED NOEXTRACT)
       if(DEFINED _vfa_RENAME)
-        file(INSTALL ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} RENAME ${_vfa_RENAME})
+        file(INSTALL ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} RENAME ${_vfa_RENAME} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
       else()
-        file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR})
+        file(COPY ${ARCHIVE_PATH} DESTINATION ${PROG_PATH_SUBDIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
       endif()
     else()
       get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} EXT)
-- 
cgit v1.2.3