From 618fa203c13c30bd19826988cff66481bca0562f Mon Sep 17 00:00:00 2001
From: Curtis J Bezault <curtbezault@gmail.com>
Date: Fri, 19 Jul 2019 08:01:38 -0700
Subject: [vcpkg] Portfile Settings (#7292)

---
 scripts/get_triplet_environment.cmake | 3 +++
 scripts/ports.cmake                   | 1 +
 2 files changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake
index 24ff40905..21464bb2e 100644
--- a/scripts/get_triplet_environment.cmake
+++ b/scripts/get_triplet_environment.cmake
@@ -1,4 +1,7 @@
 include(${CMAKE_TRIPLET_FILE})
+if (DEFINED CMAKE_ENV_OVERRIDES_FILE)
+    include(${CMAKE_ENV_OVERRIDES_FILE} OPTIONAL)
+endif()
 
 # GUID used as a flag - "cut here line"
 message("c35112b6-d1ba-415b-aa5d-81de856ef8eb")
diff --git a/scripts/ports.cmake b/scripts/ports.cmake
index 860d08893..58510567b 100644
--- a/scripts/ports.cmake
+++ b/scripts/ports.cmake
@@ -67,6 +67,7 @@ if(CMD MATCHES "^BUILD$")
     file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR} ${CURRENT_PACKAGES_DIR})
 
     include(${CMAKE_TRIPLET_FILE})
+    include(${ENV_OVERRIDES_FILE} OPTIONAL)
     set(TRIPLET_SYSTEM_ARCH ${VCPKG_TARGET_ARCHITECTURE})
     include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_definitions.cmake)
     include(${CMAKE_CURRENT_LIST_DIR}/cmake/vcpkg_common_functions.cmake)
-- 
cgit v1.2.3