From b2b2c9136918ed3ef85961c5c2885b9562d07d1d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 2 Feb 2017 15:41:20 -0800 Subject: [vcpkg] Override Boost_COMPILER setting for all packages and toolchain to enable mixing VS2015 and VS2017 --- scripts/buildsystems/vcpkg.cmake | 2 ++ 1 file changed, 2 insertions(+) (limited to 'scripts/buildsystems') diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 7be93e54d..e7b2b20db 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -57,6 +57,8 @@ if(NOT VCPKG_TOOLCHAIN) ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link ) + set(Boost_COMPILER "-vc140") + set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools) option(VCPKG_APPLOCAL_DEPS "Automatically copy dependencies into the output directory for executables." ON) -- cgit v1.2.3