From 56bd48bd2a3d288fa446791caaf738f49f555353 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Fri, 23 Jan 2015 02:07:19 -0600 Subject: [PATCH] elseif (WINDOWS AND WORD_SIZE EQUAL 32)' mistakenly clobbered. Also, try 'ProgramFiles(x86)' envvar first --- indra/cmake/QuickTimePlugin.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/indra/cmake/QuickTimePlugin.cmake b/indra/cmake/QuickTimePlugin.cmake index b769b29ba..171213d42 100644 --- a/indra/cmake/QuickTimePlugin.cmake +++ b/indra/cmake/QuickTimePlugin.cmake @@ -8,8 +8,12 @@ endif(INSTALL_PROPRIETARY) if (DARWIN) include(CMakeFindFrameworks) find_library(QUICKTIME_LIBRARY QuickTime) - - SET(program_files $ENV{ProgramW6432}) +elseif (WINDOWS AND WORD_SIZE EQUAL 32) + SET(program_files "ProgramFiles(x86)") + SET(program_files $ENV{${program_files}}) + if(NOT program_files) + SET(program_files $ENV{ProgramW6432}) + endif(NOT program_files) if(NOT program_files) SET(program_files $ENV{ProgramFiles}) endif(NOT program_files)