aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-10-10 23:58:00 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2016-10-10 23:58:00 -0700
commit140756c6fb37aa076e1f8fcec510307b78c6227a (patch)
tree5f7a76fdd9812a85b27bb9f098627095e014a1de /scripts
parent1f055ef47236f931a48f73ba98daea26bbe575ce (diff)
parentdf72c26f1ed8a3b19f3c8834a843a5f773bbcb19 (diff)
downloadvcpkg-140756c6fb37aa076e1f8fcec510307b78c6227a.tar.gz
vcpkg-140756c6fb37aa076e1f8fcec510307b78c6227a.zip
Merge branch 'master' of https://github.com/Microsoft/vcpkg
Diffstat (limited to 'scripts')
-rw-r--r--scripts/buildsystems/vcpkg.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake
index ca0900b89..cd4de3f21 100644
--- a/scripts/buildsystems/vcpkg.cmake
+++ b/scripts/buildsystems/vcpkg.cmake
@@ -36,6 +36,8 @@ if(NOT VCPKG_TOOLCHAIN)
include_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include)
+ set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools)
+
option(OVERRIDE_ADD_EXECUTABLE "Automatically copy dependencies into the output directory for executables." ON)
if(OVERRIDE_ADD_EXECUTABLE)
function(add_executable name)