From 23fe13d8fbf2103f6c9b33890096c64adedae2b6 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sat, 23 Mar 2019 08:22:57 -0700 Subject: [PATCH] cmake: fix syntax error in Win32Deps.cmake In a construct such as: ```cmake if($ENV{FOO} MATCHES bar) ... endif() ``` if the environment variable is not set, the if statement becomes a syntax error because there is nothing being compared. Fix this by quoting the environment variable like so: ```cmake if("$ENV{FOO}" MATCHES bar) ... endif() ``` Signed-off-by: Rafael Kitover --- cmake/Win32Deps.cmake | 2 +- vcpkg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Win32Deps.cmake b/cmake/Win32Deps.cmake index 412dd957..fa165fed 100644 --- a/cmake/Win32Deps.cmake +++ b/cmake/Win32Deps.cmake @@ -5,7 +5,7 @@ if(WIN32) endif() set(WINARCH x86) - if(CMAKE_C_COMPILER MATCHES x64 OR CMAKE_CXX_COMPILER MATCHES x64 OR $ENV{VSCMD_ARG_TGT_ARCH} MATCHES x64) + if(CMAKE_C_COMPILER MATCHES x64 OR CMAKE_CXX_COMPILER MATCHES x64 OR "$ENV{VSCMD_ARG_TGT_ARCH}" MATCHES x64) set(WINARCH x64) endif() diff --git a/vcpkg b/vcpkg index b5ae25cf..c2ad1baa 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit b5ae25cf3d1e8c28095f5379f18f1a47390b33a0 +Subproject commit c2ad1baafccc91bf7e9e60a390eb91cf4e130062