From 8411640ab0e8377c83b8ae0aa00f37f70b99f223 Mon Sep 17 00:00:00 2001 From: Brad Davis Date: Tue, 29 Jan 2019 11:53:13 -0800 Subject: [PATCH] Fix erroneous 'CMAKE_TOOLCHAIN_FILE has changed' errors on Jenkins --- hifi_vcpkg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hifi_vcpkg.py b/hifi_vcpkg.py index e062b40d86..4a8004f3a3 100644 --- a/hifi_vcpkg.py +++ b/hifi_vcpkg.py @@ -15,8 +15,8 @@ print = functools.partial(print, flush=True) # Encapsulates the vcpkg system class VcpkgRepo: CMAKE_TEMPLATE = """ -set(CMAKE_TOOLCHAIN_FILE "{}" CACHE FILEPATH "Toolchain file") -set(CMAKE_TOOLCHAIN_FILE_UNCACHED "{}") +get_filename_component(CMAKE_TOOLCHAIN_FILE "{}" ABSOLUTE CACHE) +get_filename_component(CMAKE_TOOLCHAIN_FILE_UNCACHED "{}" ABSOLUTE) set(VCPKG_INSTALL_ROOT "{}") set(VCPKG_TOOLS_DIR "{}") """