elseif (WINDOWS AND WORD_SIZE EQUAL 32)' mistakenly clobbered. Also, try 'ProgramFiles(x86)' envvar first

This commit is contained in:
Shyotl
2015-01-23 02:07:19 -06:00
parent ca98523c41
commit 56bd48bd2a

View File

@@ -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)