From 32548fe2edae25ed307ebebc12712fc8df920f64 Mon Sep 17 00:00:00 2001 From: Adam Martin Date: Sun, 9 Oct 2016 10:55:46 -0500 Subject: [PATCH 1/2] Add the tools directory to CMAKE_PROGRAM_PATH so find_program and similar can locate installed tools --- scripts/buildsystems/vcpkg.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index ca0900b89..88145c463 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) From 3f77292da57c35c4048b847a018c85150418476d Mon Sep 17 00:00:00 2001 From: Adam Martin Date: Sun, 9 Oct 2016 10:59:37 -0500 Subject: [PATCH 2/2] Fixed tabs to spaces formatting --- scripts/buildsystems/vcpkg.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 88145c463..cd4de3f21 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -36,8 +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) - + 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)