diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-03-16 12:51:33 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2015-03-19 14:41:52 +0000 |
| commit | 4ace1bd380a7477459776dc57ba84fe9a24222eb (patch) | |
| tree | c005a4771bad0c641989967b36e3f4b20f792fcb /cmake | |
| parent | 40f5ce12859076b63307480ff2f0bbdf42bbf258 (diff) | |
cmake: Fix CMP0053 violation.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/FindDirectX.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmake/FindDirectX.cmake b/cmake/FindDirectX.cmake index 29f04b97..fc631fe2 100644 --- a/cmake/FindDirectX.cmake +++ b/cmake/FindDirectX.cmake @@ -39,8 +39,11 @@ if (WIN32) set (DirectX_ARCHITECTURE x86) endif () - if ("$ENV{ProgramFiles(x86)}") - set (ProgramFiles "$ENV{ProgramFiles(x86)}") + # Can't use "$ENV{ProgramFiles(x86)}" to avoid violating CMP0053. See + # http://public.kitware.com/pipermail/cmake-developers/2014-October/023190.html + set (ProgramFiles_x86 "ProgramFiles(x86)") + if ("$ENV{${ProgramFiles_x86}}") + set (ProgramFiles "$ENV{${ProgramFiles_x86}}") else () set (ProgramFiles "$ENV{ProgramFiles}") endif () |